diff options
Diffstat (limited to 'hiera/cat.yaml')
| -rw-r--r-- | hiera/cat.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/hiera/cat.yaml b/hiera/cat.yaml index ac29b93..e407dac 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -90,14 +90,12 @@ mynetworks: - "198.252.153.82" - "198.252.153.83" - "198.252.153.85" - - "199.119.112.12" - "199.119.112.150" - "199.119.112.205" - "199.119.112.206" - "199.119.112.207" - "199.119.112.208" - "199.119.112.223" - - "199.119.112.8" - "204.13.164.171" - "204.13.164.57" - "37.218.240.50" @@ -199,11 +197,7 @@ testing: api_hosts: - donkey.unstable.bitmask.net api_uri: "https://api.unstable.bitmask.net:4430/1" -<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1 - monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr -======= monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR ->>>>>>> new unstable environment x509: ca_cert: | -----BEGIN CERTIFICATE----- |