recompile

3 files changed, 3 insertions, 78 deletions

diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index d3a8992..5150c50 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -12,12 +12,10 @@ diplocaulus,diplocaulus.bitmask.i,diplocaulus.bitmask.net,199.119.112.150 ssh-rs
 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
 dotterel,dotterel.dev.bitmask.i,dotterel.dev.bitmask.net,37.218.240.50 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR
 elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDbVBsw4Hnwoh1h+/J5NP6Uj6s1ViumP6zeeAtrr/ma/NrvR3x1bXmy/O396zbuFER6a8EyhGwY6WI+vKTjKWMGlOaNyNO7s9CB/keFBx4GGTcx55oHFb/WU0BzFUBoLjfEgelx/03+NIrZyW2XaPYDPdmNOfxMtetBziLugTXsXONIZBD4/QCt+LvbYdjWtziCH/EsdFuetDZ+WZrrUjCHyg2Lm8Xd48U/QrfPUb0oP8QZfoToN5l2Mxx7CnxX1s606zc/kkeaiF6+ATUPJ/6CTTdXZUN3Mg9dFMMyyZLB4TpSX7ldnwE2Wkvc/ngQjS/L8YBoMxsywPw7Q2+rFlV
-gecko,gecko.cdev.bitmask.i,gecko.cdev.bitmask.net,37.218.240.87 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQeFFXLYpG4uHjeNrZXR0aKMGL+w7j51fS4UEC/GDvU3o7NrPV3zsn1M/O7k8LZ4rRRfPAL5RScTosAZIC4GTWpZfZPeg75+4uRv4jQuzuBV7e7dhnKHJkCXmNHbpn0BmieEw7KthX8wjV1Z9YJ951fVUJcvH/Z8gf9KREMpQa6JwtybyqJh0sPNROSEm/dG25W6KmHQAEyFyiHUR5vb/5Knt0cVLpVH6c8Wwb4O6OhtNoggMkoZLhXBwiDMwqc8f4qefX1P4WWXJSWKK8Ui51346j4hrMvB50V6VE5xPp8VkA45a+wrWlBRyXC+utkwPB08ZouL1F4Z2Ak7QQ+GD3
 hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=
 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=
-mudskipper,mudskipper.cdev.bitmask.i,mudskipper.cdev.bitmask.net,37.218.240.86 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYzyrBvN1kkOgHkfc7cH3dgJC6nxnulO+6QsaX3kQuFHb6m4rKfEOPYZyzmZlrKXboAUuUDVH55Q8/Drao7QT1XtnIEC6R73tlcMmJuSTfl2IQMEaIA9voE59+Q8cWmMu5O9nzzMssZTjrMZtpfatiJ1aFntumAyjKQ0vFK4s1owBg07Yt0LDchAwBXYpELX/4pZYE2vpHrQsgH9zV/DPOZTFtXAr9SR94NXIPa6P06LEAjtYCqY2sEu2BB+OHysJNHuFJF74/l859YM5gkdd0cbn1LX0/6ch4dtqqDvydKZNlura7tb+GLV+oTz59BQ89mOPPoRfcUX6DXpl6ERz
 newt,newt.dev.bitmask.i,newt.dev.bitmask.net,37.218.242.145 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
 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
 snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD
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
diff --git a/hiera/zebra.yaml b/hiera/zebra.yaml
index 8fbf987..3bad410 100644
--- a/hiera/zebra.yaml
+++ b/hiera/zebra.yaml
@@ -55,10 +55,6 @@ firewall:
     to: "37.218.242.147"
   stunnel: 
     - 
-      from: "37.218.240.86"
-      port: 15984
-      to: "37.218.242.147"
-    - 
       from: "37.218.242.146"
       port: 15984
       to: "37.218.242.147"
@@ -73,16 +69,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
 ip_address: "37.218.242.147"
 location: 
   country_code: NL
@@ -92,7 +78,6 @@ location:
 mail: 
   smarthost: 
     - lynx.cdev.bitmask.net
-    - mudskipper.cdev.bitmask.net
 name: zebra
 platform: 
   major_version: "0.9"
@@ -195,7 +180,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
 x509: