diff options
| author | kwadronaut <kwadronaut@leap.se> | 2016-10-04 00:39:40 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-10-04 00:39:40 +0200 |
| commit | 9df54d8b32bdaec36451dfc36af2092f0b2d59c2 (patch) | |
| tree | 064e99d8e3ea85a7c78b62be271002e51924a4bf /hiera/lynx.yaml | |
| parent | 4707f1b97368d3a600e8e8ce1c99489090410b6b (diff) | |
move seoul nodes to HK and update ips
Diffstat (limited to 'hiera/lynx.yaml')
| -rw-r--r-- | hiera/lynx.yaml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml index 91e29fc..10c444f 100644 --- a/hiera/lynx.yaml +++ b/hiera/lynx.yaml @@ -74,8 +74,8 @@ definition_files: }, "mudskipper": { "hostname": "mudskipper.cdev.bitmask.net", - "ip_address": "1.209.122.111", - "location": "seoul", + "ip_address": "37.218.240.86", + "location": "hong_kong", "port": 465 } }, @@ -86,11 +86,11 @@ definition_files: "name": "Amsterdam", "timezone": "+1" }, - "seoul": { - "country_code": "KR", + "hong_kong": { + "country_code": "HK", "hemisphere": "N", - "name": "Seoul", - "timezone": "+9" + "name": "Hong Kong", + "timezone": "+8" } }, "serial": 1, @@ -101,8 +101,8 @@ definition_files: "hosts": { "gecko": { "hostname": "gecko.cdev.bitmask.net", - "ip_address": "1.209.122.112", - "location": "seoul", + "ip_address": "37.218.240.87", + "location": "hong_kong", "port": 2323 }, "zebra": { @@ -119,11 +119,11 @@ definition_files: "name": "Amsterdam", "timezone": "+1" }, - "seoul": { - "country_code": "KR", + "hong_kong": { + "country_code": "HK", "hemisphere": "N", - "name": "Seoul", - "timezone": "+9" + "name": "Hong Kong", + "timezone": "+8" } }, "serial": 1, @@ -187,7 +187,7 @@ hosts: 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: "1.209.122.112" + ip_address: "37.218.240.87" port: 22 lynx: aliases: @@ -207,7 +207,7 @@ hosts: 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: "1.209.122.111" + ip_address: "37.218.240.86" port: 22 zebra: domain_full: zebra.cdev.bitmask.net @@ -233,8 +233,6 @@ mx: selector: babcfe98e4 key_lookup_domain: cdev.bitmask.net mynetworks: - - "1.209.122.111" - - "1.209.122.112" - "176.53.69.13" - "176.53.69.14" - "176.53.69.22" @@ -249,6 +247,8 @@ 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" @@ -385,8 +385,8 @@ webapp: allow_unlimited_certs: true api_tokens: allowed_ips: - - "1.209.122.111" - - "1.209.122.112" + - "37.218.240.86" + - "37.218.240.87" - "37.218.242.146" - "37.218.242.147" monitor: 5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk |