From 6a8b7c34963bb20362d6591bc31b900d4f1c2f10 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 3 Oct 2016 00:24:30 +0200 Subject: recompile, add amsterdam nodes for cdev --- hiera/mudskipper.yaml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) (limited to 'hiera/mudskipper.yaml') diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml index c02e126..f227c0f 100644 --- a/hiera/mudskipper.yaml +++ b/hiera/mudskipper.yaml @@ -70,6 +70,12 @@ definition_files: smtp_service: | { "hosts": { + "lynx": { + "hostname": "lynx.cdev.bitmask.net", + "ip_address": "37.218.242.146", + "location": "amsterdam", + "port": 465 + }, "mudskipper": { "hostname": "mudskipper.cdev.bitmask.net", "ip_address": "1.209.122.111", @@ -78,6 +84,12 @@ definition_files: } }, "locations": { + "amsterdam": { + "country_code": "NL", + "hemisphere": "N", + "name": "Amsterdam", + "timezone": "+1" + }, "seoul": { "country_code": "KR", "hemisphere": "N", @@ -96,9 +108,21 @@ definition_files: "ip_address": "1.209.122.112", "location": "seoul", "port": 2323 + }, + "zebra": { + "hostname": "zebra.cdev.bitmask.net", + "ip_address": "37.218.242.147", + "location": "amsterdam", + "port": 2323 } }, "locations": { + "amsterdam": { + "country_code": "NL", + "hemisphere": "N", + "name": "Amsterdam", + "timezone": "+1" + }, "seoul": { "country_code": "KR", "hemisphere": "N", @@ -156,6 +180,12 @@ haproxy: port: 4000 weight: 100 writable: true + zebra: + backup: true + host: localhost + port: 4001 + weight: 10 + writable: true hosts: gecko: domain_full: gecko.cdev.bitmask.net @@ -163,6 +193,16 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQeFFXLYpG4uHjeNrZXR0aKMGL+w7j51fS4UEC/GDvU3o7NrPV3zsn1M/O7k8LZ4rRRfPAL5RScTosAZIC4GTWpZfZPeg75+4uRv4jQuzuBV7e7dhnKHJkCXmNHbpn0BmieEw7KthX8wjV1Z9YJ951fVUJcvH/Z8gf9KREMpQa6JwtybyqJh0sPNROSEm/dG25W6KmHQAEyFyiHUR5vb/5Knt0cVLpVH6c8Wwb4O6OhtNoggMkoZLhXBwiDMwqc8f4qefX1P4WWXJSWKK8Ui51346j4hrMvB50V6VE5xPp8VkA45a+wrWlBRyXC+utkwPB08ZouL1F4Z2Ak7QQ+GD3" ip_address: "1.209.122.112" port: 22 + lynx: + aliases: + - api.cdev.bitmask.net + - cdev.bitmask.net + - nicknym.cdev.bitmask.net + domain_full: lynx.cdev.bitmask.net + domain_internal: lynx.cdev.bitmask.i + 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 @@ -173,6 +213,12 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYzyrBvN1kkOgHkfc7cH3dgJC6nxnulO+6QsaX3kQuFHb6m4rKfEOPYZyzmZlrKXboAUuUDVH55Q8/Drao7QT1XtnIEC6R73tlcMmJuSTfl2IQMEaIA9voE59+Q8cWmMu5O9nzzMssZTjrMZtpfatiJ1aFntumAyjKQ0vFK4s1owBg07Yt0LDchAwBXYpELX/4pZYE2vpHrQsgH9zV/DPOZTFtXAr9SR94NXIPa6P06LEAjtYCqY2sEu2BB+OHysJNHuFJF74/l859YM5gkdd0cbn1LX0/6ch4dtqqDvydKZNlura7tb+GLV+oTz59BQ89mOPPoRfcUX6DXpl6ERz" ip_address: "1.209.122.111" port: 22 + zebra: + domain_full: zebra.cdev.bitmask.net + domain_internal: zebra.cdev.bitmask.i + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" + ip_address: "37.218.242.147" + port: 22 ip_address: "1.209.122.111" location: country_code: KR @@ -180,7 +226,8 @@ location: name: Seoul timezone: "+9" mail: - smarthost: [] + smarthost: + - lynx.cdev.bitmask.net mx: aliases: {} dkim: @@ -192,7 +239,6 @@ mx: mynetworks: - "1.209.122.111" - "1.209.122.112" - - "1.209.122.123" - "176.53.69.13" - "176.53.69.14" - "176.53.69.22" @@ -207,6 +253,9 @@ mynetworks: - "199.119.112.223" - "204.13.164.171" - "37.218.240.50" + - "37.218.242.145" + - "37.218.242.146" + - "37.218.242.147" - "46.165.242.166" - "85.17.92.143" name: mudskipper @@ -308,6 +357,11 @@ stunnel: connect: gecko.cdev.bitmask.i connect_port: 15984 original_port: 5984 + zebra_5984: + accept_port: 4001 + connect: zebra.cdev.bitmask.i + connect_port: 15984 + original_port: 5984 servers: {} tags: - clientdev @@ -315,16 +369,19 @@ tags: - seoul 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: admins: - azul + - drebs - elijah + - kali - kwadronaut - mcnair - - meanderingcode + - meskio - micah - varac allow_anonymous_certs: false @@ -335,6 +392,8 @@ webapp: allowed_ips: - "1.209.122.111" - "1.209.122.112" + - "37.218.242.146" + - "37.218.242.147" monitor: 5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk api_version: 1 client_certificates: -- cgit v1.2.3