diff options
Diffstat (limited to 'hiera/lynx.yaml')
| -rw-r--r-- | hiera/lynx.yaml | 63 |
1 files changed, 3 insertions, 60 deletions
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml index 10c444f..fe326d5 100644 --- a/hiera/lynx.yaml +++ b/hiera/lynx.yaml @@ -71,12 +71,6 @@ definition_files: "ip_address": "37.218.242.146", "location": "amsterdam", "port": 465 - }, - "mudskipper": { - "hostname": "mudskipper.cdev.bitmask.net", - "ip_address": "37.218.240.86", - "location": "hong_kong", - "port": 465 } }, "locations": { @@ -85,12 +79,6 @@ definition_files: "hemisphere": "N", "name": "Amsterdam", "timezone": "+1" - }, - "hong_kong": { - "country_code": "HK", - "hemisphere": "N", - "name": "Hong Kong", - "timezone": "+8" } }, "serial": 1, @@ -99,12 +87,6 @@ definition_files: soledad_service: |- { "hosts": { - "gecko": { - "hostname": "gecko.cdev.bitmask.net", - "ip_address": "37.218.240.87", - "location": "hong_kong", - "port": 2323 - }, "zebra": { "hostname": "zebra.cdev.bitmask.net", "ip_address": "37.218.242.147", @@ -118,12 +100,6 @@ definition_files: "hemisphere": "N", "name": "Amsterdam", "timezone": "+1" - }, - "hong_kong": { - "country_code": "HK", - "hemisphere": "N", - "name": "Hong Kong", - "timezone": "+8" } }, "serial": 1, @@ -170,25 +146,13 @@ haproxy: couch: listen_port: 4096 servers: - gecko: - backup: true - host: localhost - port: 4000 - weight: 10 - writable: true zebra: backup: false host: localhost - port: 4001 + port: 4000 weight: 100 writable: true hosts: - gecko: - domain_full: gecko.cdev.bitmask.net - domain_internal: gecko.cdev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQeFFXLYpG4uHjeNrZXR0aKMGL+w7j51fS4UEC/GDvU3o7NrPV3zsn1M/O7k8LZ4rRRfPAL5RScTosAZIC4GTWpZfZPeg75+4uRv4jQuzuBV7e7dhnKHJkCXmNHbpn0BmieEw7KthX8wjV1Z9YJ951fVUJcvH/Z8gf9KREMpQa6JwtybyqJh0sPNROSEm/dG25W6KmHQAEyFyiHUR5vb/5Knt0cVLpVH6c8Wwb4O6OhtNoggMkoZLhXBwiDMwqc8f4qefX1P4WWXJSWKK8Ui51346j4hrMvB50V6VE5xPp8VkA45a+wrWlBRyXC+utkwPB08ZouL1F4Z2Ak7QQ+GD3" - ip_address: "37.218.240.87" - port: 22 lynx: aliases: - api.cdev.bitmask.net @@ -199,16 +163,6 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" ip_address: "37.218.242.146" port: 22 - mudskipper: - aliases: - - api.cdev.bitmask.net - - cdev.bitmask.net - - nicknym.cdev.bitmask.net - domain_full: mudskipper.cdev.bitmask.net - domain_internal: mudskipper.cdev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYzyrBvN1kkOgHkfc7cH3dgJC6nxnulO+6QsaX3kQuFHb6m4rKfEOPYZyzmZlrKXboAUuUDVH55Q8/Drao7QT1XtnIEC6R73tlcMmJuSTfl2IQMEaIA9voE59+Q8cWmMu5O9nzzMssZTjrMZtpfatiJ1aFntumAyjKQ0vFK4s1owBg07Yt0LDchAwBXYpELX/4pZYE2vpHrQsgH9zV/DPOZTFtXAr9SR94NXIPa6P06LEAjtYCqY2sEu2BB+OHysJNHuFJF74/l859YM5gkdd0cbn1LX0/6ch4dtqqDvydKZNlura7tb+GLV+oTz59BQ89mOPPoRfcUX6DXpl6ERz" - ip_address: "37.218.240.86" - port: 22 zebra: domain_full: zebra.cdev.bitmask.net domain_internal: zebra.cdev.bitmask.i @@ -222,8 +176,7 @@ location: name: Amsterdam timezone: "+1" mail: - smarthost: - - mudskipper.cdev.bitmask.net + smarthost: [] mx: aliases: {} dkim: @@ -247,8 +200,6 @@ mynetworks: - "199.119.112.223" - "204.13.164.171" - "37.218.240.50" - - "37.218.240.86" - - "37.218.240.87" - "37.218.242.145" - "37.218.242.146" - "37.218.242.147" @@ -348,13 +299,8 @@ ssh: stunnel: clients: couch_client: - gecko_5984: - accept_port: 4000 - connect: gecko.cdev.bitmask.i - connect_port: 15984 - original_port: 5984 zebra_5984: - accept_port: 4001 + accept_port: 4000 connect: zebra.cdev.bitmask.i connect_port: 15984 original_port: 5984 @@ -365,7 +311,6 @@ tags: testing: api_hosts: - lynx.cdev.bitmask.net - - mudskipper.cdev.bitmask.net api_uri: "https://api.cdev.bitmask.net:4430/1" monitor_auth_token: 5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk webapp: @@ -385,8 +330,6 @@ webapp: allow_unlimited_certs: true api_tokens: allowed_ips: - - "37.218.240.86" - - "37.218.240.87" - "37.218.242.146" - "37.218.242.147" monitor: 5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk |