diff options
| author | elijah <elijah@riseup.net> | 2016-04-09 10:34:46 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-04-09 10:34:46 -0700 |
| commit | 3d75bc820b671dacae72fb3cc7aad2e8da3b293a (patch) | |
| tree | 923ad6d876eaa467e290bb2930091e11b5aee9f1 /hiera/alpaca.yaml | |
| parent | 9f002e16620c037c123b464c2bbeea0842f8ed2c (diff) | |
recompile
Diffstat (limited to 'hiera/alpaca.yaml')
| -rw-r--r-- | hiera/alpaca.yaml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml index 26bdda9..ffbeb23 100644 --- a/hiera/alpaca.yaml +++ b/hiera/alpaca.yaml @@ -3,6 +3,8 @@ api: ca_cert_uri: "https://mail.bitmask.net/ca.crt" domain: api.mail.bitmask.net port: 4430 + uri: "https://api.mail.bitmask.net:4430/1" + version: 1 clamav: whitelisted_addresses: [] contacts: @@ -185,6 +187,10 @@ haproxy: writable: true hosts: alpaca: + aliases: + - api.mail.bitmask.net + - mail.bitmask.net + - nicknym.mail.bitmask.net domain_full: alpaca.mail.bitmask.net domain_internal: alpaca.mail.bitmask.i host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtpKckyjDgSw555znY6Ww2ZHzYZvNkf/dm6Xml4SVM4hFTUVIhgAuFXoUcMjwOcAzbnqPdZN/zGCzTGGBnPrw9YvwaP2oso1b/tysEGYvemvxJlLxo7wQKLbTj8u89LahGFZhoUBFxIX6u0f4gBFURGKHgotyjRJq5tM19CjgnO7L3lhjXl/04Zd5mmQPoHuGNi8wjxZVHLi+cbmG1qXFIXhqb1nDjq2dJh+NJGRZ4IrkkNYYB/V1RlQvHfJ6eof7pyVUWLwyOBe11DkyOooKl/pOkH4jVVCKP2Asbdu7nlqq6il88pQpL0CsikikWvMgWJ9TqafI2kBJ6QX484foH" @@ -205,8 +211,10 @@ mx: private_key: /srv/leap/files/mx/dkim.key public_key: /srv/leap/files/mx/dkim.pub selector: babcfe98e4 - key_lookup_domain: bitmask.net + key_lookup_domain: mail.bitmask.net mynetworks: + - "1.209.122.111" + - "1.209.122.112" - "1.209.122.123" - "176.53.69.13" - "176.53.69.14" @@ -215,9 +223,6 @@ mynetworks: - "198.252.153.83" - "198.252.153.85" - "199.119.112.150" - - "199.119.112.151" - - "199.119.112.152" - - "199.119.112.153" - "199.119.112.205" - "199.119.112.206" - "199.119.112.207" @@ -336,6 +341,11 @@ stunnel: tags: - dc - mail +testing: + api_hosts: + - alpaca.mail.bitmask.net + api_uri: "https://api.mail.bitmask.net:4430/1" + monitor_auth_token: vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2 webapp: admins: - azul @@ -349,6 +359,10 @@ webapp: allow_limited_certs: false allow_registration: true allow_unlimited_certs: true + api_tokens: + allowed_ips: + - "199.119.112.223" + monitor: vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2 api_version: 1 client_certificates: bit_size: 2048 |