move seoul nodes to HK and update ips

8 files changed, 220 insertions, 228 deletions

diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 5cbcf17..e98475a 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -213,8 +213,6 @@ mx:
     selector: babcfe98e4
   key_lookup_domain: mail.bitmask.net
 mynetworks: 
-  - "1.209.122.111"
-  - "1.209.122.112"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -229,6 +227,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"
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 79f8a3a..a7def58 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -81,8 +81,6 @@ mx:
     selector: babcfe98e4
   key_lookup_domain: unstable.bitmask.net
 mynetworks: 
-  - "1.209.122.111"
-  - "1.209.122.112"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -97,6 +95,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"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index bd9c44f..ce0e86d 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -260,7 +260,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
   hippo: 
     domain_full: hippo.bitmask.net
@@ -302,7 +302,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
   newt: 
     domain_full: newt.dev.bitmask.net
@@ -480,7 +480,7 @@ nagios:
       domain_internal: gecko.cdev.bitmask.i
       domain_internal_suffix: cdev.bitmask.i
       environment: clientdev
-      ip_address: "1.209.122.112"
+      ip_address: "37.218.240.87"
       services: 
         - couchdb
         - soledad
@@ -529,7 +529,7 @@ nagios:
       domain_internal: mudskipper.cdev.bitmask.i
       domain_internal_suffix: cdev.bitmask.i
       environment: clientdev
-      ip_address: "1.209.122.111"
+      ip_address: "37.218.240.86"
       services: 
         - mx
         - webapp
diff --git a/hiera/gecko.yaml b/hiera/gecko.yaml
index e690f04..86c339b 100644
--- a/hiera/gecko.yaml
+++ b/hiera/gecko.yaml
@@ -1,8 +1,4 @@
 --- 
-apt: 
-  url: 
-    backports: "http://ftp.daum.net/debian/"
-    basic: "http://ftp.daum.net/debian/"
 contacts: 
   - drebs@leap.se
   - sysdev@leap.se
@@ -52,11 +48,11 @@ firewall:
   soledad: 
     from: "*"
     port: 2323
-    to: "1.209.122.112"
+    to: "37.218.240.87"
   ssh: 
     from: sysadmin
     port: 22
-    to: "1.209.122.112"
+    to: "37.218.240.87"
   stunnel: []
 hosts: 
   lynx: 
@@ -77,14 +73,14 @@ 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
-ip_address: "1.209.122.112"
+ip_address: "37.218.240.87"
 location: 
-  country_code: KR
+  country_code: HK
   hemisphere: "N"
-  name: Seoul
-  timezone: "+9"
+  name: "Hong Kong"
+  timezone: "+8"
 mail: 
   smarthost: 
     - lynx.cdev.bitmask.net
@@ -187,7 +183,7 @@ stunnel:
       connect_port: 5984
 tags: 
   - clientdev
-  - seoul
+  - hongkong
 testing: 
   api_hosts: 
     - lynx.cdev.bitmask.net
@@ -230,92 +226,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      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
-      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
-      9XktvCn92bOqBCiSuLwg+QJshP8=
+      vayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAKLo0gXNSA8XuxK02
+      x0mQP9hY575jtA34SBb2mM5AEsIg3/vg9Pm/4SCl2eURz3Inl+vuK6xNO/i69tvq
+      8X/9Sk1UqOZG9TxW8J/aVJWp7U7KyoskbX6cnFZU/I4NMgFAJ8X2AtlkQhplxu17
+      zH6p1idR/QtmDtYeZuFEXPqejfS8GxXHN5mmgqnC9ROif6deZ2VZ+U9BXqfpZKBn
+      ycxEOD3BTEiQNPtWRfknfkbRWCl471ZZ4JyEs/3E/kdW3yPU8TSWXqpCz5vd5ifl
+      SxhZy5YMK7ZFBMftuNzMOs5LrGlRJrnK7RvkzaSZn7ACe98cnvWC6nfyPXMf7Zcn
+      HSqFAZdRIDAHU65+d9/Q3HY85ugwyzzhL2EgCDaa9EplDjxbXDQe8kE4ey6qHZlW
+      lkPLK0Pd8EJywsgQbgLmDiO5m5AgNtkcsYCDFYbdyjNtYZczaJu5sq1wP5ChaQl6
+      y4/knugp784mjHxea2ad2qmzdnsAOCLgqn2WpqIYCq5NDnbm/CrQZ+XKboX8FNac
+      a1iKIhppXWkYZdp7ViCy8KQ+qiQjpql0jaZzvS+IQt6MqzPFN7Apum8AFwr/kIgD
+      MXiD3IjnDlOHCsHM9O/Z42sVt1O/JU/mZCFfiK2S2U69XJ0scYp+TvuPlraMBs5R
+      dIA/ilWKUqfvppuHIiPr5SWHOGI=
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
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
diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml
index e91a259..61b9f16 100644
--- a/hiera/mudskipper.yaml
+++ b/hiera/mudskipper.yaml
@@ -5,10 +5,6 @@ api:
   port: 4430
   uri: "https://api.cdev.bitmask.net:4430/1"
   version: 1
-apt: 
-  url: 
-    backports: "http://ftp.daum.net/debian/"
-    basic: "http://ftp.daum.net/debian/"
 clamav: 
   whitelisted_addresses: []
 contacts: 
@@ -78,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
           }
         },
@@ -90,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,
@@ -105,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": {
@@ -123,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,
@@ -156,11 +152,11 @@ firewall:
     port: 
       - 25
       - 465
-    to: "1.209.122.111"
+    to: "37.218.240.86"
   ssh: 
     from: sysadmin
     port: 22
-    to: "1.209.122.111"
+    to: "37.218.240.86"
   stunnel: []
   webapp: 
     from: "*"
@@ -169,7 +165,7 @@ firewall:
       - 4430
       - 6425
       - 80
-    to: "1.209.122.111"
+    to: "37.218.240.86"
 haproxy: 
   couch: 
     listen_port: 4096
@@ -191,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: 
@@ -211,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
@@ -219,12 +215,12 @@ hosts:
     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"
+ip_address: "37.218.240.86"
 location: 
-  country_code: KR
+  country_code: HK
   hemisphere: "N"
-  name: Seoul
-  timezone: "+9"
+  name: "Hong Kong"
+  timezone: "+8"
 mail: 
   smarthost: 
     - lynx.cdev.bitmask.net
@@ -237,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"
@@ -253,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"
@@ -365,8 +361,8 @@ stunnel:
   servers: {}
 tags: 
   - clientdev
+  - hongkong
   - letsencrypt
-  - seoul
 testing: 
   api_hosts: 
     - lynx.cdev.bitmask.net
@@ -390,8 +386,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
@@ -513,39 +509,39 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      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
-      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
+      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
-      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
-      NxTVomHYObixrw==
+      LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQBZbHzNw/F+oMElsXyujF6Rw4yIRybX
+      +e146Qzx99/EeWXUysdyJoJnndmYlLM9VT4vjNYgew9911ordxHHsSM31KufeFhj
+      yspGW+edMJO8O6VAbkYidHK+aq6JC6LoaW3O6JD7cFl7NCquMDVRmditV0KFAOd3
+      nmStsQf41Ig/EvEER85m8QHyNg1lrboGLDXs9thhovm0qaBznU7o9V2Ty6BcpWKL
+      ZEpnIQIfNCCCf2Jk/liSgmLKmAqOuSi54CeJw0ackzgEPz9Ky1WhY/upKdFL50ym
+      dzT55B7h91OS5CHL5uiXhWc+t65u+zKvHZyDqpObmpJxiI+VcBOop3cr3Ol9tMQg
+      f1uZVMK+9wbioC5mIZFelDrtG7DF/SajcwcQXYxoRiulPWlMd5sRzwTbSRwjvdvA
+      6gPALlXdxbZ4U9bMziQofoMTYe8+3VeCrsBGD7liMzrKe0OO2KrcUHuHengzBymG
+      XWNmUx7SobcK8BxNPlZwKCOsl0PRd+g3kgV/WLbuj0i32pxuxUUE2ffv8X60LIDg
+      sdvvnkdi5+nL2eh47amy8TLGF78ZxWBDiX7s4wGSi+mITK3DxUBpiBa4nlYgoq+h
+      LmbEPzWajaz7rN2wXsmQzXxv5TqNN2T5bZlfbJBEZ3Inls1iDEomFZjb/r4a+wUk
+      Ol5GXBz5dmZDPg==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -778,55 +774,55 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      MIIJJwIBAAKCAgEAyeHQQL83aKjKj6nEWCWrXkfHMQaMe9tYPhhcgntlnQ7f9Esv
-      rKbGSkhML/Bc8sutQoAbNjgZI+maZAinO9jcBnfvWeFQzP5lA3XOlOjUizGuAQ4P
-      5Q/SoukEpLe9hcnPMYQMq0SGExUPV3pQInlKaHkJxNXeDR1zerdSlRkJVuVnObFL
-      VE5uiP8HYgitAOXvD5LpqC93+VMoTvhsxNu3fIRWRoaHwOuRsFCZGU8gM3dVIST4
-      1r8TiyQXy+yYOIzCv6wsI1y3wlty0+653qIk1B8dWGuDRc1ZbEMeI6gMoP1Evafb
-      6EOccJlz6ePh+cEaQ/A+bUzpHoW/pikWIcR+J23hPk/3Q/MSF3g+8y3IqR5cgYOI
-      oTuQf9RmqRRyYVC1po7TrxOgWl/wC6zCr/9jGSmICaW0rhNKEC9yIoEm7VqSksjG
-      ohZgpjKmNI1+B9E07aCeAfOWi/m5Z2tE1w1PHDmNgwyA0jKFTu3ng6ACZZ/Ol6p8
-      sHoXEuPz33mPySljGmG49K7ZVS+FaxUBBmG2H5FkC2+dGi8jU/iJe8t/6zFPYOgT
-      MRMPft6lHZOtVQfTEHJjbtFjHQl37O7JLBYja1U9E+M/4zxL+4M9ob4n4cHQ1SXh
-      dF7lb/4xD9Lkm0Z/2d4cmI7IMhp8Obuv+3YABhRbLHT6dSKV4kwcaqFbz8ECAwEA
-      AQKCAgADG6/qH0eKG/cqaRG1zbaqt+4wKgqlqYXdRuC9vYqd9WmrSDEOtm6dHCnY
-      Hxo/PrWHLZO9rPVuIR2YZq20dS1GCDiuKJLm5Q/HEtxAXKlRD02/hGjoPOsgSPgi
-      VRXc5nODLqZHSMHLr2pSDXcIYNetbhehaS2HBCoP/JyP4RfMt7F0KO+g96gqAcsq
-      TjnjpqaclcV1Km3tb8NSG+8IxN05VIxDf7S9WqMelM8WnapAQJkV7ozKOZziaobX
-      Q+hADqK88rinPrkxi9jjvGwuKk7o2SXJg7Y8r+Gtkgb3w5GWNPAG/3uaQtg4v5QS
-      SMjk4H04CI3dfu6j4qlFtKI7mNvcVos/M1cOA8WRnmada6XNzvI3WudKcbs66Xwu
-      Jy024RYkmfw/aUFRYRMhIslOAOK1qM119P8fDMI0gId6hstfYwGlsOD7yR7S/iKn
-      7+TQbJ/MOoUPMlnUOSFsqY1zSwqWYtS5NgHL97cKWOkdpgJz+vz0l+NV61Xc/3nT
-      1XNYUsisbqBMZUGspOPG3BQHP8SYVscyRhP4VrNlISgPCJRfetDAmU09jJ4s7HXk
-      KFLGxx7Ho2KHnN+2Q4XARLakyty1hEgExxNoxfzv6i1igqHOQ/Jzk8jmSd+r43qu
-      jkOzsLIvocuxWbBx5VXudBJnCWnVUQHEUtPMmA+VS95lZaJ+sQKCAQEA6He+r6Xh
-      TRtBLcmPs/nmcHanhxI/3PXqEFmJ+MiQ4WuWHNc3V5JXXEs15vooCvxC/yXk6O/r
-      ZJ/7RrBdvr0SpiIlbPr+2E4cbeSNGY9jNsl5r+VBJ3XZ72Zk2bZy0QTEd919YXiF
-      neWmnAfsOR0OGk6SR+WzFmkrBJK7tU7PiOgy3D14HN5LPN6jdHymXyM+p1wRHHBw
-      HINLwalF1eHHpsYJnfhppS53MkTQBYp2d16qn5sHMYJXOdoDWeToXjcKxhYP8N3Q
-      lpcpaW3LINhFRScHUCNDVpAosFgQIuHsVayxOqx5xupTK4hzyIqP59DH8YMIRvk2
-      3WqgDa9kQuJTVQKCAQEA3lF11gqCJzYqyUHt8DyBB7UPvmRHOyqIZB97HdqDe3ZK
-      QpRX5HbjtR3N7cI90jkHgqVwe4snsSMJ0Ca7z2Dtoy2F1epsKNv13LHnweLkLMIB
-      8OcAYEqqsVvxUloqQ2y9ZAnTwRqSuu7NHwM5PcSdb3FpY59pTWhNhuBtRhx/TYP7
-      viEocwJr/jc1RPQuVVMrKJA14PCueC3nF14BiCmq+l3Zr6HLRVqtMFsSYoOCfcq5
-      ACfNhCP5AJST9hZfPsX4SLyxdweIx0U1yEr4WsHPSwG17PbAcJ7qqMmDYUsBCz4k
-      1lpDeQNFvolEC8sRyVVeZg7cOibwqx46hIeZAmcivQKCAQAI2LW6/XcLdiQO2ALN
-      +I6abQmHDFy9zeXwZVfozcklqvB1fIMwo/MLIhmVBqQLdvodt5V0f9zXYXcwg3mt
-      zogtJlOCSDL2jFJspCvycxB1f0lQNks6czOt9pmT52uLJMFNRnKFCQ8cqSaj/XEx
-      4zcsLR1H+yfLjIkEjYjzJ2KidSOqWfR+NL9sO5TA1BWIvVCfEdPc3zKFA0IYxpZP
-      w13TrOmkx1VN4ezLTu8TpudHN6UKmd22Np2XKALEov9sxm90hlZo9if/8xSyXGlE
-      gLZyIUAX/p+LZcUGoPNMQIi74eyErRedSEGOAI1Xbl53lexl9nSULtu1pV8d5jTM
-      jsxZAoIBAH7YucQrcMGQvW7hiDJHQ1Ozck0uiBnxFasS7ztEXzrFbm94loGLeDbx
-      z3p2FrHoyik33esPpdEC7elvAD+9zTkKk09PlvDlN+35MAPHQmtrMpJSKzvFvoi9
-      rf5P5cdctt7qYIDQeaHg+PZV74YXtcBNVFV8MifxeDKZwJ99SQFgafW8k4izfAyr
-      UWCLdhhHANv/FE7I5LM7dZw2jecz5xM9EySLyyBCMYjinaXJ5V2CmnXFQBTCNaOo
-      IpgJgcSeTiCqURNaICeajKpAZF3cMTtZuYR/8aMQeVFe0PBlTC4vAfOvwsm8HUIu
-      rb2Q2xAl/lt65Rrk9vKbp8XQXHQrhn0CggEADp8g9tnOwx9zr6xGmoC8gBy/gbbI
-      Eqnx+VEUuXJVg80qA7Ll6toobLXFL39N+1qZJYyrBN9wC850Wk3p+1I6nN1ERHTi
-      kFIuCGkEUyP5xPZNUorO7DYH0PEX8LG2FSaIddgun2UC2vABlctvvAZ5tmZA2hbz
-      B/l9qIl4cxOdEe+wls1w4hIHJG+S3xd7YqPFbyc5k5920lxMXR77oa/8OfnCvsMT
-      a0UA2PoCiBTznbfT/zRuIrQ2ZfVL1qlmz4pJFwfagHrdzykdlAtxPr6+gmEtqZ2R
-      U9JYyH8+Irf8xFHkNq2cbgYrBFEnVEz0qqQmPxHHORCN4DsN1pY3qqsW8Q==
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index d311e3e..733cb4f 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -88,8 +88,6 @@ mx:
     selector: babcfe98e4
   key_lookup_domain: dev.bitmask.net
 mynetworks: 
-  - "1.209.122.111"
-  - "1.209.122.112"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -104,6 +102,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"
diff --git a/hiera/zebra.yaml b/hiera/zebra.yaml
index 04d06ab..8fbf987 100644
--- a/hiera/zebra.yaml
+++ b/hiera/zebra.yaml
@@ -55,7 +55,7 @@ firewall:
     to: "37.218.242.147"
   stunnel: 
     - 
-      from: "1.209.122.111"
+      from: "37.218.240.86"
       port: 15984
       to: "37.218.242.147"
     - 
@@ -81,7 +81,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
 ip_address: "37.218.242.147"
 location: