update after removal of giraffe

11 files changed, 278 insertions, 347 deletions

diff --git a/files/nodes/tuatara/tuatara.crt b/files/nodes/tuatara/tuatara.crt
index f8529ef..ef83725 100644
--- a/files/nodes/tuatara/tuatara.crt
+++ b/files/nodes/tuatara/tuatara.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIQD6q5VLnAGHexL33sViP8oDANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTgwODI5MDAwMDAwWhcNMTkw
-ODI5MDAwMDAwWjAnMSUwIwYDVQQDDBx0dWF0YXJhLnVuc3RhYmxlLmJpdG1hc2su
-bmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsS9XAskhmzFvJOln
-eakUemEJZYHDAL5vbdxT+Sl588DumgFl0oO6AR1JN+Pg16Z4ZxroT24SvHdt7gbr
-WMwFsqAJ0n8DXX+6PcJI3UU49WITt5RI8x023UXV6nm+DdeibAKghEWmd/h71j0V
-yJz5tPaG0Q+fgFdKNF4DyPFIzUgCNw+yNI1iOdaH4KPNdDvgosoaMtWQOWWxFqSE
-AIcyqy7eM59rI5U3h7PLfXdNQDF6UrhPMmyD5WLaifgaA+BMh6MytWvqM+jg4eFm
-89yXlsOoyvUKJlxDMmBY4er7G2GKcWZLAmCK+GvQiB4YP/cC++UaPWddWuCtUIpL
-quThvv8l7aZgcxSZEQS/Hu1tyalFHFEBuVTSpU+J8Npt5EqyDDO54rkxMQTBHATL
-A2/RLots7hvyGZgUu08lQxrVq8V1Byc6XBsxdirOKpIjDYlq1AOUhocO/3nYlj8W
-1b6Ol6t2PJTDBUUbruPlYg/TOOgRx+0HnK1PX6jeNVd4vg40ENIbZaXdtcmnNqeP
-XITIG+PE16Te2qbJOrDR9BHHMLqZ7WS82UG2r09wWM/u6ZvUI2u/ykioLPy+3GBo
-BP9qUz1de3b6UCrXOrIYxyG2QqUEsKF5z0DRUgGfCF8yZJXbx2s9Y9X9U+ahjVso
-scJbrxUVoKPwxT/N2qZhsIhI8jUCAwEAAaOBxTCBwjAdBgNVHQ4EFgQULvOnbdhZ
-ca5aJeYCYjnIAY9J6O0wSQYDVR0RBEIwQIIadHVhdGFyYS51bnN0YWJsZS5iaXRt
-YXNrLmmCHHR1YXRhcmEudW5zdGFibGUuYml0bWFzay5uZXSHBMd3cNAwCwYDVR0P
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAA
-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
+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
 -----END CERTIFICATE-----
diff --git a/files/nodes/tuatara/tuatara.key b/files/nodes/tuatara/tuatara.key
index 72bca14..bba3232 100644
--- a/files/nodes/tuatara/tuatara.key
+++ b/files/nodes/tuatara/tuatara.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 84ab4c5..b5bfaec 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -9,8 +9,7 @@ cat,cat.unstable.bitmask.i,cat.unstable.bitmask.net,199.119.112.206 ssh-rsa AAAA
 demodex,demodex.unstable.bitmask.i,demodex.unstable.bitmask.net,204.13.164.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx1qgYlN/Y69I0mn2NhjEw8RtSMw3XoQ79lushppGJlQse7lJx0fNyKc/xy/qxi0YSrgoXKm/gD4GaESqFglvIygDuNxiVyBDGUfCpPvmkp+q9eduBFL+UrIoLdsxpjx0hfLZfZ6YoXwGd44sK5pcn+5ov9h4HZCrjxDEAGr/Tg2hU+UXSV53136MZuGT4ylXZ3jIM6c6Pm9tBFSVH3TUuSmbzgCVTbvA2g6OqskMRACov0NrmADr8MfO6idRqIlZ/s8FmJOKtOjQMbQWq52PJ4yIEcaSUE0fmlERLnHVCrKfDojVOgXfeazHN9td2xojQTkT44rm/bqp1bx/QRss9
 donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR
 leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ
-lynx,lynx.cdev.bitmask.i,lynx.cdev.bitmask.net,37.218.242.146 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
 millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
 otter,otter.demo.bitmask.i,otter.demo.bitmask.net,46.165.242.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp
 penguin,penguin.bitmask.i,penguin.bitmask.net,37.218.242.52 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDm/PDJGwWTFF7YI65K1qPPjvAacv4QJ3wdP69N2JJxFqTfYYUqrHTreAU09AnK7Pc2tmvgeS+Qa0xl0niBwU8YOlk+0M95cloq44RFJt/84jIJypMrzXY3MVZuVaud6L39Ks+Urx4XAL70EoTUnuD+FzbWKkGfdEkoPrvQs/cncBqhPxpK7w2Ovpqg30ZHfJtlkQss+1rA68HkO49ZZpbni08bLurkg/6WfxmcDZvK4OsuhlLaDATQweWwqK2UplcI4l9LcsZGwRNbIKuRVQPyv3fqLCoku8zPdjRQ5LYo0GPcHnYsFk4RFXoKplUYQBcVLdC8hVvk8Z7CPKAPc4zD
-tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n
+tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,37.218.241.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index ae47cca..979dab5 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -207,15 +207,13 @@ mynetworks:
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.150"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
-  - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "37.218.242.146"
-  - "37.218.242.191"
+  - "37.218.241.208"
+  - "37.218.242.52"
   - "46.165.242.166"
 name: alpaca
 nickserver: 
@@ -484,38 +482,38 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      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
-      AQsFAAOCAgEAoIFYxaFp0xT8IWXtHdZ35t837536o9MIUxVN9TfSEiqkQI9Z0eM0
-      GvcV3DHx9W0511kiQ7ByBBFj9XKFd91Pv8DMD8qAFJdOvdNLlzUO1hkYuYC0FmwP
-      24RXttpiyj46T/NRaCuVG4yjjPj82bxghdW4T8BO1j9M3SmugbAxOG9XxsitTOwm
-      d2HWsNytuXR2EwNBRXL4imfKhdD3aEm18yl99GGfujLxs51P0ejWGwu2yYGHIJOs
-      R8WUGVX29jDW3Hw4D3sTtgoWN7Nf17kIMzIQUSKURi7HngsIcp1pWrbMYszo66Qq
-      4BDXNctBMFsVBVrEOIkKXekQyEkeYBJzrpMkAtCZaQ4GLjZwd2W1wkigRvBBrn8f
-      RxASlmMheRAQ7nnlRl6WFb8f4go44vS6XgFg7gZB52HHPeVufD+YJqMXG1yUu6IE
-      GvIgEfFoP+ehG9Yv8xVsdZvCFIJlL1/axHnW0ogLH8kx3bXkGUsXjzKcLw6yWQcd
-      Q1Qwj0y0uwDuhzIG9WboroWOuh8jIWYS/IydLIOpC6ysrCaXdZnUC0XYOn2z7mEp
-      9rCDd6s4RpKya9h1IJXafQtd1+MzGv3AHsaYfGgA+MqeBBmOsOALNH1DgT9ab1Rx
-      MvRJk44UmqRTYuarHIJiCJ2kUJIPStxBnfH5B/3rjaV3ZPjMsQWZ4ow=
+      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
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -726,55 +724,55 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index b970915..4390464 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -76,15 +76,13 @@ mynetworks:
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.150"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
-  - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "37.218.242.146"
-  - "37.218.242.191"
+  - "37.218.241.208"
+  - "37.218.242.52"
   - "46.165.242.166"
 name: cat
 platform: 
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index d666511..3372495 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -28,15 +28,15 @@ definition_files:
               "user_ips": false
             },
             "host": "tuatara.unstable.bitmask.net",
-            "ip_address": "199.119.112.141",
-            "location": "washington_d_c_"
+            "ip_address": "37.218.241.141",
+            "location": "miami"
           }
         ],
         "locations": {
-          "washington_d_c_": {
+          "miami": {
             "country_code": "US",
             "hemisphere": "N",
-            "name": "Washington D.C.",
+            "name": "Miami",
             "timezone": "-5"
           }
         },
@@ -208,15 +208,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx1qgYlN/Y69I0mn2NhjEw8RtSMw3XoQ79lushppGJlQse7lJx0fNyKc/xy/qxi0YSrgoXKm/gD4GaESqFglvIygDuNxiVyBDGUfCpPvmkp+q9eduBFL+UrIoLdsxpjx0hfLZfZ6YoXwGd44sK5pcn+5ov9h4HZCrjxDEAGr/Tg2hU+UXSV53136MZuGT4ylXZ3jIM6c6Pm9tBFSVH3TUuSmbzgCVTbvA2g6OqskMRACov0NrmADr8MfO6idRqIlZ/s8FmJOKtOjQMbQWq52PJ4yIEcaSUE0fmlERLnHVCrKfDojVOgXfeazHN9td2xojQTkT44rm/bqp1bx/QRss9"
     ip_address: "204.13.164.171"
     port: 22
-  diplocaulus: 
-    aliases: 
-      - bitmask.net
-      - www.bitmask.net
-    domain_full: diplocaulus.bitmask.net
-    domain_internal: diplocaulus.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpvETs31Zg2omqF9k3dq/CJDnZtrd+987VJgWex/zM/ZsRu7MYoAb34BBm2QroVwAiei5Wczn6CpdcYUuY38fdCxUVRKClm0abz0T6LT/EsqfY3N1d9OmAjN/XEWi/5+vnaiEuh313XUgD2vASFwLR+z9NHlGmz+uBaQLWRZF2Q36i2L7TOOxUG96i6knShNIGmaajVNhv078EtJlWbNzpEcVsn6CyRhyMdx0KzV2tIvitozwHcAy5UEQGGiwACxHwOS9IWn7UBHhfxf1kj1VVmnrewf6TnApvuqD8e0d9z+NnWOt9h3HAFxF92Ggs4FQ/vY7EcxgaEoW1kroGiNGP"
-    ip_address: "199.119.112.150"
-    port: 22
   donkey: 
     aliases: 
       - api.unstable.bitmask.net
@@ -227,12 +218,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR"
     ip_address: "199.119.112.207"
     port: 22
-  giraffe: 
-    domain_full: giraffe.cdev.bitmask.net
-    domain_internal: giraffe.cdev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCucBWeL3Konoolf/3RHuhMCSd+GL+1wM9pyH8TiHATKN7wGbjcN+TbSthLca4qW8h5AwQWtwX2Fz0rzp5m3jrHMDH9C2kZdtV0SSv3EkG8qA19QL3UlOHI/cR959CvGEqDVn8qrnfEhp866NHNZ0Oy+eqfdYbrAGxsTOFJYhlxeAcgtPwDnunEfVyycmjgijx8VlNzb0iLFEUAlK4+wKubabrm1ZgiVIvJrivZ2oUrOvplOlo9WPwdYDZCahjsWxTHIMFtPxaJMQsE0jzu/BnwvMztVyyfpYypB/IVFMY/onADExB2BDbTu0mFpHskd+pQSLQnm7Yrf6/Jg8e1FoGv"
-    ip_address: "37.218.242.191"
-    port: 22
   leech: 
     aliases: 
       - api.demo.bitmask.net
@@ -243,16 +228,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
     ip_address: "198.252.153.85"
     port: 4422
-  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
   millipede: 
     domain_full: millipede.demo.bitmask.net
     domain_internal: millipede.demo.bitmask.i
@@ -265,11 +240,20 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp"
     ip_address: "46.165.242.166"
     port: 4422
+  penguin: 
+    aliases: 
+      - bitmask.net
+      - www.bitmask.net
+    domain_full: penguin.bitmask.net
+    domain_internal: penguin.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDm/PDJGwWTFF7YI65K1qPPjvAacv4QJ3wdP69N2JJxFqTfYYUqrHTreAU09AnK7Pc2tmvgeS+Qa0xl0niBwU8YOlk+0M95cloq44RFJt/84jIJypMrzXY3MVZuVaud6L39Ks+Urx4XAL70EoTUnuD+FzbWKkGfdEkoPrvQs/cncBqhPxpK7w2Ovpqg30ZHfJtlkQss+1rA68HkO49ZZpbni08bLurkg/6WfxmcDZvK4OsuhlLaDATQweWwqK2UplcI4l9LcsZGwRNbIKuRVQPyv3fqLCoku8zPdjRQ5LYo0GPcHnYsFk4RFXoKplUYQBcVLdC8hVvk8Z7CPKAPc4zD"
+    ip_address: "37.218.242.52"
+    port: 22
   tuatara: 
     domain_full: tuatara.unstable.bitmask.net
     domain_internal: tuatara.unstable.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n"
-    ip_address: "199.119.112.208"
+    ip_address: "37.218.241.208"
     port: 22
 ip_address: "199.119.112.207"
 location: 
@@ -283,16 +267,10 @@ mail:
 nagios: 
   domains_internal: 
     - bitmask.i
-    - cdev.bitmask.i
     - demo.bitmask.i
     - mail.bitmask.i
     - unstable.bitmask.i
   environments: 
-    clientdev: 
-      contact_emails: 
-        - drebs@leap.se
-        - kwadronaut@leap.se
-        - micah@leap.se
     demomail: 
       contact_emails: 
         - sysdev@leap.se
@@ -355,15 +333,6 @@ nagios:
       services: 
         - backup
       ssh_port: 22
-    diplocaulus: 
-      domain_full_suffix: bitmask.net
-      domain_internal: diplocaulus.bitmask.i
-      domain_internal_suffix: bitmask.i
-      environment: production
-      ip_address: "199.119.112.150"
-      services: 
-        - static
-      ssh_port: 22
     donkey: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: donkey.unstable.bitmask.i
@@ -374,16 +343,6 @@ nagios:
         - monitor
         - webapp
       ssh_port: 22
-    giraffe: 
-      domain_full_suffix: cdev.bitmask.net
-      domain_internal: giraffe.cdev.bitmask.i
-      domain_internal_suffix: cdev.bitmask.i
-      environment: clientdev
-      ip_address: "37.218.242.191"
-      services: 
-        - couchdb
-        - soledad
-      ssh_port: 22
     leech: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: leech.demo.bitmask.i
@@ -393,16 +352,6 @@ nagios:
       services: 
         - webapp
       ssh_port: 4422
-    lynx: 
-      domain_full_suffix: cdev.bitmask.net
-      domain_internal: lynx.cdev.bitmask.i
-      domain_internal_suffix: cdev.bitmask.i
-      environment: clientdev
-      ip_address: "37.218.242.146"
-      services: 
-        - mx
-        - webapp
-      ssh_port: 22
     millipede: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: millipede.demo.bitmask.i
@@ -424,13 +373,22 @@ nagios:
         - openvpn
         - tor_relay
       ssh_port: 4422
+    penguin: 
+      domain_full_suffix: bitmask.net
+      domain_internal: penguin.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: production
+      ip_address: "37.218.242.52"
+      services: 
+        - static
+      ssh_port: 22
     tuatara: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: tuatara.unstable.bitmask.i
       domain_internal_suffix: unstable.bitmask.i
       environment: unstable
-      ip_address: "199.119.112.208"
-      openvpn_gateway_address: "199.119.112.141"
+      ip_address: "37.218.241.208"
+      openvpn_gateway_address: "37.218.241.141"
       services: 
         - openvpn
       ssh_port: 22
@@ -578,8 +536,8 @@ webapp:
       - "199.119.112.205"
       - "199.119.112.206"
       - "199.119.112.207"
-      - "199.119.112.208"
       - "204.13.164.171"
+      - "37.218.241.208"
     monitor: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
   api_version: 1
   billing: 
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index 60aa4dc..74165e5 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -296,11 +296,6 @@ ssh:
 stunnel: 
   clients: 
     couch_client: 
-      giraffe_5984: 
-        accept_port: 4000
-        connect: giraffe.cdev.bitmask.i
-        connect_port: 15984
-        original_port: 5984
   servers: {}
 tags: 
   - amsterdam
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 16f6a7d..4b0bfe7 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -18,27 +18,27 @@ firewall:
   ssh: 
     from: sysadmin
     port: 22
-    to: "199.119.112.208"
+    to: "37.218.241.208"
   stunnel: []
   vpn: 
     from: "*"
     port: 
       - 21724
       - "443"
-    to: "199.119.112.141"
+    to: "37.218.241.141"
 hosts: {}
-ip_address: "199.119.112.208"
+ip_address: "37.218.241.208"
 location: 
   country_code: US
   hemisphere: "N"
-  name: "Washington D.C."
+  name: Miami
   timezone: "-5"
 mail: 
   smarthost: 
     - cat.unstable.bitmask.net
 name: tuatara
 obfsproxy: 
-  gateway_address: "199.119.112.141"
+  gateway_address: "37.218.241.141"
   scramblesuit: 
     password: JJAUC422KNVGMMRXIZIGM3LOK44XMQ2Z
     port: 21724
@@ -54,7 +54,7 @@ openvpn:
     tls-cipher: DHE-RSA-AES128-SHA
     tun-ipv6: true
   filter_dns: false
-  gateway_address: "199.119.112.141"
+  gateway_address: "37.218.241.141"
   limited_prefix: LIMITED
   ports: 
     - "443"
@@ -158,7 +158,7 @@ stunnel:
   clients: {}
   servers: {}
 tags: 
-  - dc
+  - miami
   - unstable
 x509: 
   ca_cert: |
@@ -196,37 +196,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -279,55 +279,55 @@ x509:
       -----END DH PARAMETERS-----
   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/nodes/lynx.json b/nodes/lynx.json
index 4d039bd..f8d2c43 100644
--- a/nodes/lynx.json
+++ b/nodes/lynx.json
@@ -1,4 +1,5 @@
 {
+  "enabled": false,
   "ip_address": "37.218.242.146",
   "services": [
     "mx",
diff --git a/nodes/tuatara.json b/nodes/tuatara.json
index 82443df..bcbbbd1 100644
--- a/nodes/tuatara.json
+++ b/nodes/tuatara.json
@@ -1,11 +1,11 @@
 {
-  "ip_address": "199.119.112.208",
+  "ip_address": "37.218.241.208",
   "openvpn": {
-        "gateway_address": "199.119.112.141"
+        "gateway_address": "37.218.241.141"
   },
   "services": "openvpn",
   "tags": [
-    "dc",
+    "miami",
     "unstable"
   ]
 }
diff --git a/secrets.json b/secrets.json
index a73f890..33becc6 100644
--- a/secrets.json
+++ b/secrets.json
@@ -1,22 +1,4 @@
 {
-  "clientdev": {
-    "api_monitor_auth_token": "5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk",
-    "couch_admin_password": "abVQmkZubeAvncgcVSYRD4_pHANEItWb",
-    "couch_admin_password_salt": "a5a58ff4365be3113f19014ea3050129",
-    "couch_leap_mx_password": "HJXaTzM5gChwwr5Ur3epyacegvXNIDYK",
-    "couch_leap_mx_password_salt": "b80d3038cfaa3bd0802dc140752d0dc6",
-    "couch_nickserver_password": "vjJAZqxPL4BeGKAEUVuBVK5MIba_aIY5",
-    "couch_nickserver_password_salt": "eab38a050b5eb2569549f8e50cab9034",
-    "couch_replication_password": "CGcAbvXcXuGRUJE_WSj6TEw6cJxNHRtu",
-    "couch_replication_password_salt": "d124d33d15f0171cead41d238e58ec9e",
-    "couch_soledad_password": "MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De",
-    "couch_soledad_password_salt": "ac15331e0c098126e04ecf7a21045079",
-    "couch_webapp_password": "_CatyL3Ienc4wRrfPubrhyfYCFmCyt9t",
-    "couch_webapp_password_salt": "1c1dd6eb78f027414f1638bd6c902a5a",
-    "nagios_test_password": "HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL",
-    "webapp_secret_key_base": "KKTTExcvRPZByNyXJEpCjAKg3asHD9XI",
-    "webapp_secret_token": "MwScfJR7TbrkhSbsYIkMLuac55J48rnt"
-  },
   "demomail": {
     "api_monitor_auth_token": "sLEMhZk5VgjuXTFkgyzkPspV9cVSfLHN",
     "couch_admin_password": "zmTmc8mBqwcrHIC4RUuca3LhKtKbjCub",