diff options
author | Micah Anderson <micah@riseup.net> | 2014-11-24 16:11:17 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2014-11-24 16:11:17 -0500 |
commit | 364a43d1ac65abd030baeddfc3eff763486cfe16 (patch) | |
tree | 490cc48ed0f7bf2022c35792d29067e4d7bd03c1 /hiera/octopus.yaml | |
parent | 2d0248f9c8d9692ec7df4f46c659282d1a7c310c (diff) |
update ssh host keys
Diffstat (limited to 'hiera/octopus.yaml')
-rw-r--r-- | hiera/octopus.yaml | 78 |
1 files changed, 34 insertions, 44 deletions
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml index 5843f10..8512f0c 100644 --- a/hiera/octopus.yaml +++ b/hiera/octopus.yaml @@ -18,15 +18,12 @@ domain: enabled: true environment: unstable haproxy: - couch: - listen_port: 4096 - servers: - panda: - backup: false - host: localhost - port: 4000 - weight: 100 - writable: true + servers: + panda: + backup: false + host: localhost + port: 4000 + weight: 100 hosts: octopus: domain_full: octopus.unstable.bitmask.net @@ -48,41 +45,38 @@ mail: smarthost: [] mynetworks: - "176.53.69.127" - - "176.53.69.13" - - "176.53.69.14" - - "176.53.69.21" - - "176.53.69.22" + - "199.119.112.9" + - "192.168.5.9" - "176.53.69.23" - - "192.168.5.10" - - "192.168.5.12" - - "192.168.5.16" - - "192.168.5.19" - - "192.168.5.23" - - "192.168.5.4" + - "199.119.112.5" - "192.168.5.5" - - "192.168.5.8" - - "192.168.5.9" - - "198.252.153.82" - - "198.252.153.83" - - "198.252.153.85" + - "176.53.69.21" + - "204.13.164.171" - "199.119.112.10" + - "192.168.5.10" + - "198.252.153.83" - "199.119.112.12" + - "192.168.5.12" + - "204.13.164.162" + - "198.252.153.82" - "199.119.112.16" + - "192.168.5.16" + - "204.13.164.57" + - "176.53.69.14" - "199.119.112.19" + - "192.168.5.19" + - "176.53.69.13" + - "202.85.227.195" - "199.119.112.23" + - "192.168.5.23" + - "85.17.92.143" + - "176.53.69.22" - "199.119.112.4" - - "199.119.112.5" + - "192.168.5.4" + - "198.252.153.85" - "199.119.112.8" - - "199.119.112.9" - - "202.85.227.195" - - "204.13.164.162" - - "204.13.164.171" - - "204.13.164.57" - - "85.17.92.143" + - "192.168.5.8" name: octopus -platform: - major_version: "0.6" - version: "0.6" service_type: user_service services: - mx @@ -123,17 +117,14 @@ ssh: ports: "60000:61000" port: 4422 stunnel: - clients: - couch_client: - panda_5984: - accept_port: 4000 - connect: panda.unstable.bitmask.i - connect_port: 15984 - original_port: 5984 - servers: {} + couch_client: + panda_5984: + accept_port: 4000 + connect: panda.unstable.bitmask.i + connect_port: 15984 tags: - - dc - unstable + - dc x509: ca_cert: | -----BEGIN CERTIFICATE----- @@ -435,4 +426,3 @@ x509: O1j7UCNyBJ70TpZ4F7RR3rcmlFbR8Moys/GrEMuUG1CJmOHRxGju2g== -----END RSA PRIVATE KEY----- use: true - use_commercial: true |