leap compile

8 files changed, 214 insertions, 329 deletions

diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index e6259db..679b6c4 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -15,13 +15,10 @@ elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AA
 ferret,ferret.dev.bitmask.i,ferret.dev.bitmask.net,1.209.122.123 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR/YWDsdYumj5mYunnLgQSuoNMKcItqQT/cmPkFCRp5WERouxdu/GW/0F78K+FyRTp3xwEzJ3BCF/5lbgDH9pRBLiezH+d2Lj2STz82EL0TtOTRtAhF+sK6X2/HFJ6PiIkmAlGGFiw09VR8aGdIhY9FaJATClUWEqjtdFd9BplLWasrmuEVN4kHe2dcO6SxHAfdsmhqd7YdpvfkhenBI1ZPAPYWk72fFFdV35gYBf1H1DewBcobuUCUbd+5EvTJnOfYum9noZBcQScvjuXX/pn4yHefNxh7qBlD92V1hJhK7CHiU4nw2Z4bM2oMLr6Jw81PhQf732DACPrNT+GcEEx
 gecko,gecko.cdev.bitmask.i,gecko.cdev.bitmask.net,1.209.122.112 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=
-ladybug,ladybug.bitmask.i,ladybug.bitmask.net,199.119.112.8 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN
 leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ
 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,1.209.122.111 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYzyrBvN1kkOgHkfc7cH3dgJC6nxnulO+6QsaX3kQuFHb6m4rKfEOPYZyzmZlrKXboAUuUDVH55Q8/Drao7QT1XtnIEC6R73tlcMmJuSTfl2IQMEaIA9voE59+Q8cWmMu5O9nzzMssZTjrMZtpfatiJ1aFntumAyjKQ0vFK4s1owBg07Yt0LDchAwBXYpELX/4pZYE2vpHrQsgH9zV/DPOZTFtXAr9SR94NXIPa6P06LEAjtYCqY2sEu2BB+OHysJNHuFJF74/l859YM5gkdd0cbn1LX0/6ch4dtqqDvydKZNlura7tb+GLV+oTz59BQ89mOPPoRfcUX6DXpl6ERz
 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
-ovenbird,ovenbird.cdev.bitmask.i,ovenbird.cdev.bitmask.net,199.119.112.151 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz
-seahorse,seahorse.bitmask.i,seahorse.bitmask.net,199.119.112.12 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1
 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
 tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT/9Z0BIVLpriNPdkk9cEsh0/tave+Jx80dcrt1/04tzFgitUl77AWnvcMIBfZKZTZpxZrakw/K165opvZEhuz/H7ztdc069HAVRn5wqpBvRVMovuhDtYaaFrFu5zo7Mg9MgJwc1Y0SUsBjItKuvgid5hRpy61N+0KDiXDl9T/QZj340kD/pMEHjqVmVoKkRn8/KK6S9cTaAAeTvbYfz/lPQHsyJ/M8emhySk/OCQIdAJ9SqMkX2MMd081tqFAa/H0D22vdgh9DhnrRlmmaZ5Z4P6P1U7ieLTWdLG5n7bTrPgWQAC5uElhzsa3uhlHyKgmHUWDr47hWCA1X0TCKZk/
 wallaby,wallaby.demo.bitmask.i,wallaby.demo.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ=
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 498a063..19d96ab 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -68,11 +68,7 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
-<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
-=======
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
->>>>>>> new unstable environment
     ip_address: "199.119.112.207"
     port: 22
 ip_address: "199.119.112.205"
@@ -184,11 +180,7 @@ testing:
   api_hosts: 
     - donkey.unstable.bitmask.net
   api_uri: "https://api.unstable.bitmask.net:4430/1"
-<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
-  monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
-=======
   monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
->>>>>>> new unstable environment
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index ac29b93..e407dac 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -90,14 +90,12 @@ mynetworks:
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.12"
   - "199.119.112.150"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
   - "199.119.112.223"
-  - "199.119.112.8"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"
@@ -199,11 +197,7 @@ testing:
   api_hosts: 
     - donkey.unstable.bitmask.net
   api_uri: "https://api.unstable.bitmask.net:4430/1"
-<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
-  monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
-=======
   monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
->>>>>>> new unstable environment
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index 65342dd..492feb3 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -192,93 +192,90 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIGRjCCBS6gAwIBAgIRAMXTXEN0h4ykzS3Z4Z5tmyYwDQYJKoZIhvcNAQELBQAw
-          gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-          BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-          VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-          Q0EwHhcNMTUwNDAyMDAwMDAwWhcNMTYwNDE1MjM1OTU5WjBPMSEwHwYDVQQLExhE
-          b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRQw
-          EgYDVQQDEwtiaXRtYXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-          ggIBAJcUgSPtPUSCjhuIS2gwqU2/QukygEoZFf3SwR6XmbYj8GkEiXNm79p3T4kC
-          5DEeHpRTrD3KrLir78PLxXC/AIKhRB3+dSoKI8aMfBOBvw0jS/E7AGA+0jdo+Lia
-          Hd9JZgWNl1FLgviIvYixaJTIA9+56ZIFu0s9To9VDEsLixXBMGvBQ+qJTkTrBRsE
-          Etc3EtPX5qYeTOt5zj6ewowlIBYL8yAqxBO0tyYvVBhNW3wnMaELK9oruRgiV06J
-          BdUQqkUoRCRsjgqEMrx2Ah/nMcUgmFR3C8XnrQGVaJLkXp4FKCIHMFrzDO24fEyD
-          dEhCLyXEUpC2P0wEXY9C1m29yuNgk33eA085GNT3X39FWdT58b0HsUZ3Fder144L
-          b4hunHah5pbE+GLvTKSCjWOZHjA+0P0bIjhGzqQPE96sB+hkmmAUuavuTM5YsDaY
-          cahuN9fBUh9BfClmbFb4Rp4qAptcKHc2mQtbF3uXvOb/y3BsMlBQ01dS0WR3JTba
-          BQ9YbF5kuwRoeeQIrj1EDKpMoMgm7L+7t/2ZXnZvXI64uUneRnDi/Qb6PF06gR1U
-          FBSiSkXorQIV+TO53pbNEkfBrL06pzpgTG4mzPyReFhHYKtpAekloaWb1ppcUDz7
-          fSk2SEddinBHLoMWPwMHZ+K02ycXWb38qmxQAGZ2BWxRZYiJAgMBAAGjggHZMIIB
-          1TAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQURlCc
-          FmI2dgueauqLhs7unyuIUQ0wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-          HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYB
-          BAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNv
-          bS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29t
-          b2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJD
-          QS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5j
-          b21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl
-          ckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCcG
-          A1UdEQQgMB6CC2JpdG1hc2submV0gg93d3cuYml0bWFzay5uZXQwDQYJKoZIhvcN
-          AQELBQADggEBAIsv7f5sxvUm4nvtst9o/KMBjgcuXSB41Ti8v+DVRzz/iyANDZTi
-          hpTHnjnQa4/aXkY1Ko5449MRhHAGPTxEX2cyPHRTg8RcGFQzTpEcTbsOMlL18M8N
-          Vo+qjj/MK3F95nz1lD2EqF58uYkGpmEfqIcbAHpuSab+1btb0zSE+SOpPXML6Az2
-          rqHXGYZ4jKQ0cepyIgR84quczVk2AhvXMNVuYWQUPbZ7CbaVdumwsyRgG6oXcGOP
-          Km7P5HwcqV8577RcSLI7XnYfQgkTH8xtrgD68h4l7AazjhsRoVO60qEx3YQA5cmb
-          zgmKCy3yOhRP0/kZBNsbIXH3w4lOmNQ2zNE=
+          MIIFCzCCA/OgAwIBAgISA+jsGoAwcxUbypA6PbIZkQngMA0GCSqGSIb3DQEBCwUA
+          MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA0MTUxOTU0MDBaFw0x
+          NjA3MTQxOTU0MDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIIBIjANBgkqhkiG
+          9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNwj9ihHw863j/NZo5eyd3cuhe4KJNT9eGQ9
+          19Cabz7Oxg+xLlXtAcIqa/RQUmI4wLS8duZ96ElntSCZk56uVaaTQrpo2Fzfe9kg
+          oz+rK8NoQvBUkb3eTxflyUxJjAf5FukCQwq8WIYhBzQ52QLWxscl6Gf8Vtkq3X2P
+          6uN5sFSN603PkbmylDmlFuz1v3lsFqfwtc+1UeZZVnra4kHRoCaK0bOggcCsE4a4
+          /gMGiccfA2WgOe8zsn8E/QLj3Bs2gTfkAmRYFWh6ZNLE4do6+JJltC5UTsmUq3V7
+          R0Im6UevaVjuVputC4aG83nU7nm//RC1+JZzJUgoTng6JwMVUwIDAQABo4ICHTCC
+          AhkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+          AjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQhPQnU12X9L0BofIkPHlj/xN8x9zAf
+          BgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBwBggrBgEFBQcBAQRkMGIw
+          LwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcv
+          MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
+          LzAnBgNVHREEIDAeggtiaXRtYXNrLm5ldIIPd3d3LmJpdG1hc2submV0MIH+BgNV
+          HSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAmBggrBgEFBQcC
+          ARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUFBwICMIGeDIGb
+          VGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBvbiBieSBSZWx5
+          aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0
+          aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcv
+          cmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEi/xtNPUOTwICAGC/Naaj8Z
+          BuLLYRMy1Lbs1cBlmZ6ki7hw4vZIh+MAA4MMbKrJxK+WQnpMVKmE27acUSxXrCX4
+          H69CSlGmrvgvPFL7sv1l75MVzh08Tp4B2+Q+3KbxH8Qgxs7HPfvAeZyFwG7ozVR/
+          lwkqJfqpI/3N4aRqkex+k4NsCIldLlouGWaWGua5aznQWOWVRs/1mOPfbuDPRSL4
+          f+4izk2FqRZ9pOgebq3XGGTdodzJ2x7SDCp01ng8RYLKf9FPmCWwcwobZ19mAF6k
+          gDsjskMw5oiuu5mmLfLx+wLasIncPuBO5qFLoIGAwmy1KCrPpviemjYwYJ9HLv4=
+          -----END CERTIFICATE-----
+          -----BEGIN CERTIFICATE-----
+          MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+          MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+          DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+          SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+          GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+          AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+          q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+          SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+          Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+          a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+          /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+          AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+          CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+          bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+          c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+          VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+          ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+          MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+          Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+          AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+          uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+          wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+          X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+          PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+          KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
           -----END CERTIFICATE-----
       key: |
-          -----BEGIN RSA PRIVATE KEY-----
-          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
-          -----END RSA PRIVATE KEY-----
+          -----BEGIN PRIVATE KEY-----
+          MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC43CP2KEfDzreP
+          81mjl7J3dy6F7gok1P14ZD3X0JpvPs7GD7EuVe0Bwipr9FBSYjjAtLx25n3oSWe1
+          IJmTnq5VppNCumjYXN972SCjP6srw2hC8FSRvd5PF+XJTEmMB/kW6QJDCrxYhiEH
+          NDnZAtbGxyXoZ/xW2SrdfY/q43mwVI3rTc+RubKUOaUW7PW/eWwWp/C1z7VR5llW
+          etriQdGgJorRs6CBwKwThrj+AwaJxx8DZaA57zOyfwT9AuPcGzaBN+QCZFgVaHpk
+          0sTh2jr4kmW0LlROyZSrdXtHQibpR69pWO5Wm60LhobzedTueb/9ELX4lnMlSChO
+          eDonAxVTAgMBAAECggEAa/2GMI3VZqjDCR/jFLNQuYNxNSIa4Otf60275vBg1238
+          gy21ltjxbJ6OA6Skq4vflYu/sUHy+ZiwMdqKfPcs5rI5wrh8+TBACeyMqXFPQHCV
+          3szgyob9cH0IarDbIieiNuUFwj5qStiIQNoclQ6Yg2ThW0Qr4FxbMyrfwRsEAqJT
+          Mrl86B692MEOa634YVYcefoIYG3AfSdRg/4BF1fe+mpezrqp4hnTOW/dNyEpJRro
+          sXQVeJk+vW2sfxfyBwKon24t4wV15GgS98JgBYGR1+w7FwyKvlHozkq7MqynD5JJ
+          FfoCtVJ7jf6JHQ66/1yBLCUzJMpF4ybYtQty8j8UgQKBgQDvdw3HppH9Y7E6FDyd
+          O09T+0zgkdUtF0L7muXtcSn9cBwaoQNHU2z/eAqY2cv++BeZEF4d5LZdp6LTGflF
+          fnT6t02mtE7UU2YhI3vwTCC25fnceXg+Ym7VTqwTXq26PfDnV09AVjRbgxvSZ8yY
+          kPD9Ehg8Ww6KlhdpSGIEkZDFkwKBgQDFn9l1pKO9TBbiLQGdjDEdz11f0Opq8tuY
+          xHi49KJJvN+g6KSuw/hkXNLCunnNEMCixfL7QdUfNCXPJWL8RiXRbfsidppi8nfF
+          aeDYXs2MAaa5oecbbxu+odtPQIEMWJNTO22DnMb8XjQALncbTkWXCsiMswF5grb+
+          75d4Ra5JQQKBgQDMz8Hccg5JcBvj9e0F+fVWegh9xp1SzKOAuTJRDEoCtwGCkRZR
+          yfve4NgHdbixoZXlV4d3/+cuYTO1ZHC8THVW/rKOk4ccuRwP2d6mXyZX6Ij1VntO
+          uDfdf0VT59WlBldmNlnVSCXN42xHYHowPz+u4+wQqzzbsZXieYNELxBouwKBgAKT
+          QKwtxwxyb2HnIDxDVWiECT10ZXmbTI1DEiem2G6JjYh1P6AfYZ89LmnnMCsh6sC0
+          P6RSiUpszYlTfWS4LUn7WuhqDzz21+S0qn9nTNpkMx38JBzRZ9UmGst/la7pgJH3
+          Fkg+xMEJIThXYqnybSm4tEBRHNXOhD/yM1EX51uBAoGAbAMbAGZVmdhTTz223wqj
+          Id0uTobOEATAV6IvF82wThI/2JJmNwx8eFlWBymGcLIi/6rxJAMeC9Gkf45T+cQ9
+          92IHd+RYHns35WuoBJ/2y1qBN2t6EZAW2d7mlpzm0dCp2RSMOmGLKSy2ZxwH8c3R
+          PJMPWT6n/OZwL+8i6xRdL0M=
+          -----END PRIVATE KEY-----
       locations: 
         front: 
           format: amber
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 3929442..0c10e82 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -275,12 +275,6 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc="
     ip_address: "85.17.92.143"
     port: 4422
-  ladybug: 
-    domain_full: ladybug.bitmask.net
-    domain_internal: ladybug.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN"
-    ip_address: "199.119.112.8"
-    port: 22
   leech: 
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
@@ -309,22 +303,6 @@ 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
-  ovenbird: 
-    aliases: 
-      - api.cdev.bitmask.net
-      - cdev.bitmask.net
-      - nicknym.cdev.bitmask.net
-    domain_full: ovenbird.cdev.bitmask.net
-    domain_internal: ovenbird.cdev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
-    ip_address: "199.119.112.151"
-    port: 22
-  seahorse: 
-    domain_full: seahorse.bitmask.net
-    domain_internal: seahorse.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1"
-    ip_address: "199.119.112.12"
-    port: 4422
   snail: 
     domain_full: snail.dev.bitmask.net
     domain_internal: snail.dev.bitmask.i
@@ -516,15 +494,6 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
-    ladybug: 
-      domain_full_suffix: bitmask.net
-      domain_internal: ladybug.bitmask.i
-      domain_internal_suffix: bitmask.i
-      environment: disabled
-      ip_address: "199.119.112.8"
-      services: 
-        - backup
-      ssh_port: 22
     leech: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: leech.demo.bitmask.i
@@ -565,25 +534,6 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
-    ovenbird: 
-      domain_full_suffix: cdev.bitmask.net
-      domain_internal: ovenbird.cdev.bitmask.i
-      domain_internal_suffix: cdev.bitmask.i
-      environment: clientdev
-      ip_address: "199.119.112.151"
-      services: 
-        - webapp
-      ssh_port: 22
-    seahorse: 
-      domain_full_suffix: bitmask.net
-      domain_internal: seahorse.bitmask.i
-      domain_internal_suffix: bitmask.i
-      environment: disabled
-      ip_address: "199.119.112.12"
-      openvpn_gateway_address: "199.119.112.13"
-      services: 
-        - openvpn
-      ssh_port: 4422
     snail: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: snail.dev.bitmask.i
@@ -743,11 +693,7 @@ webapp:
       - "199.119.112.206"
       - "199.119.112.207"
       - "199.119.112.208"
-<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
-    monitor: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
-=======
     monitor: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
->>>>>>> new unstable environment
   api_version: 1
   billing: 
     braintree: 
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 6912805..5a61c19 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -423,93 +423,65 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGVDCCBTygAwIBAgIQTs4jNfKb8/YyxYBtUZPQMDANBgkqhkiG9w0BAQsFADCB
-      kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-      A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-      BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-      QTAeFw0xNTA0MDIwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMFQxITAfBgNVBAsTGERv
-      bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxGTAX
-      BgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQDwvMa2z8biMMCkq9whwuVG9pRQn3ebohFGcyOa4c7PDqFHwTVCDmK4
-      8Bq/7w2PC+meQ5NV1Bm6GwWYB9qpRcrmM7VM69Ee8ttp4rKnCk11EO8cktvvP+Ea
-      kKkdaXxLI0BKPzl5RJaFfb4xggHL96cN65ZcVDW+ghloKGsZxwTOQOUfBMksgPQR
-      pO3XzM5BDlWm122gKyRQPWMoXoTOWDmbzydX2sgpZ9jxoMbzAQ9JB7Vjwoz0lqj8
-      94ckXFLDV7qdYWfJHyQNERCqa1rCovIFk61HbCqutfKw//atiAw1NinBUAa2em2i
-      PdKYWpubTAGeZ4MWzgpwg9+5ynUDf3p1XXNAH3R97Y957IPTdAqR4dwShG//xIL7
-      PQUL9csZadMfzlln9rjpNhRTfWiNkB3TA4mUhzvpmpJSp+b6xYpkYgxNQOoscAvk
-      Sz2pUkJFmDXrBnbz8cRD8mD4NRxgif3fEPce3kT97BoDyXL1mX2Hd2nVF2ayjfTQ
-      ZwVjLpV/Hw/MYwJdjxckUVRYHaBbF5i3EbERhtBEOemoHN9hhoiu7nFw7xvu9CuA
-      F3OqoM6E3PDbUDq++XLkpDvdlAscF+RZf9fdhGfe4GmBm72iKHb3e3N4xpQp1Phy
-      OazAFPC0eYoCmDnozL+tkT1guW9gFZ417ho2TggKqu/w7xyuFHxQ7QIDAQABo4IB
-      4zCCAd8wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYE
-      FMOFwfy0IZteBeE2q8oMNaiAvn/AMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-      AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoG
-      CysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9k
-      by5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vY3Js
-      LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2Vy
-      dmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9j
-      cnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVT
-      ZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNv
-      bTAxBgNVHREEKjAoghBkZW1vLmJpdG1hc2submV0ghR3d3cuZGVtby5iaXRtYXNr
-      Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAHzH0R7oXFBzVMCTzxnuU7wHRwIp08w24
-      kjSVzEm31jBHfeq4Eg03Gg9nu4TcGzRvUisziKjq9Ew9OuoQAerqmlL4WyrX5bfH
-      eBdn8qTebTVktqyQXyfI2uOsYmPK+tL97gbCoMMdGirrbi52Wg3HX+J6IP9lZ9iP
-      DStF46CjJaRNRib6J1XSuFPQ3Lf5Ae1RcvSSsZ1nOPnrhW7X7TKbl6sAku1VagfE
-      OEFYUxn2E3rB5wRwaG+SS87nNehMocPqdueW2bTd+f1dVwbhaCjjmB/piD3i5Jy1
-      /4rWOSQXA8zMEpmUOar4WBIEQfkrfTC2zbCyaHmOa+3glxQDeA98oQ==
+      MIIFTjCCBDagAwIBAgISAyZ/0mn21/5hlpfWr8/8vkiuMA0GCSqGSIb3DQEBCwUA
+      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA0MTUyMDExMDBaFw0x
+      NjA3MTQyMDExMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
+      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUVDyzYl9hzmemkMiSdBZULJjLreFd
+      ctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpMXdqoQSZvgTXvGTWl
+      s2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajFitRtDRxc4UOP2Zr7
+      cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oawtgTcmS5gu5yNVyNi
+      +saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo58dJHFRRCLspVg3Hb
+      xVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys6DEmkbpLAgMBAAGj
+      ggJbMIICVzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLLY1bGw+EdNB0rxXJgvyfiy
+      DA+yMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
+      BGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0
+      Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
+      dC5vcmcvMGUGA1UdEQReMFyCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
+      dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCGHdhbGxhYnkuZGVt
+      by5iaXRtYXNrLm5ldDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC
+      3xMBAQEwgdYwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3Jn
+      MIGrBggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUg
+      cmVsaWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29y
+      ZGFuY2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBz
+      Oi8vbGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IB
+      AQAigffcKH59L/3CGBSWvStKBITsY8DYA4VZpxK5k+Kabs/ZDbnWVF8+6pEMF2/C
+      +WO0MTQJHnWCI4oCNPVLaVqaOMUI2dGuc+EpjSnrWEf2osnbNM7x5mI1sHoe+vVL
+      zCFP1Ebr6S3iSiQwsZZUGEhX+8PW9dW2rVjMh/QGn/+AD9cpc2ZAeOP67F1/SLPx
+      NcQVYwOjqXf0mIZxxAMIZytwhw++PNaZjaBwaoOWGLGEnMzFVZSr10lV2yuj0xyh
+      1Axtal6l6P2u1iBa1YRxUYqawyGYc+3D+cXBjK8iJ7KwItOorDq8jGTPP2Ueal+h
+      qsywV+VNgNB8AsMUHf3Q4+8Y
       -----END CERTIFICATE-----
   commercial_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
+      -----BEGIN PRIVATE KEY-----
+      MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUVDyzYl9hzmem
+      kMiSdBZULJjLreFdctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpM
+      XdqoQSZvgTXvGTWls2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajF
+      itRtDRxc4UOP2Zr7cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oaw
+      tgTcmS5gu5yNVyNi+saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo5
+      8dJHFRRCLspVg3HbxVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys
+      6DEmkbpLAgMBAAECggEBAL+orgYqdPifTNaAeFwiZ4lhnCa2dOhaZMflb8USMrE1
+      joH0moPQYXdWRVDzMlMrdf0w1KY1g0I0lEBss5QPAvfBxYJm2hMRY0NZ22W8/9N5
+      UN2GkcmtlPi47HndIKhk0KY1Su2L8/jHzkVKNMee/wwj1k2B2jC+j8DSCYCGChxi
+      zLbleRfjMfjW/wmZuP1K83QxpVgC76G+yC2IE2gYnNc2OvhMEt8Rxcl6JJDQj23k
+      4WEg1q3BNbP+Wtk7V2DDUZki3RomPi1ZyeXUjWQXMjrMKfy5EAcHgs+zAF6z69B3
+      AcOCFr+HKMYf5ZWDd2QpgxO3DD1UZlHnUaHWedlp+zECgYEA84IG9ROPXUhdpJ2+
+      kySVliol2RzZr7pvmwjEI3wuegE4DpwTnJQUAFbgaIUsWtJICt/b4RgslQVdxjpF
+      l6KDCumZKJR1q0xnDc+B3q/BXbNVcG76xIp6nSdmfy4gf+4eEYXdBzVzW89BkSaU
+      O49KS8Vqbyr3/FHfMbNOv4lDabkCgYEA3zi9cOPRJg7/jw6n9bbetcNnKC/lzEAd
+      JWi4LZ4BWBCM3ucaShfdNh32jhJAZanvtHJes4VQZDjPBT8PEYXKmwkYIYtMP75A
+      6c1zwAWxM8yc/zXUh6sN4bKtGvWdACdtFqBSL0iBSM4sRgVVNPwE8Y5Odigv1JKA
+      hHcbxFAXdiMCgYANiiFQ5zGFgkySpqK+E76thtJr7Aq+lqM1/5rITlNXPVIcndkJ
+      T8J88lev+BerRR30XNYhAfMYph+8sejEsaiPpsV5WCfiynDAd9VEyIj76MjLY6BV
+      5U1EB7jPQYVVF6xcVREhIXu0kyWWKIr9dM4wwF1WqRD42qSKYunyBHPXIQKBgAcc
+      n6yBFaDIyYudQ+yoLuBLoXW+UOv4/vS6KWQKrLBJlrNjWYsSx5F50ukj27lheKmf
+      GzVNAgqvZKkeITTFtnbKC2LGNV+yiA7q5M0xYTvtQPNAm8zWvlJ6htldCet/VhJq
+      eTPYc4YGS5LPiK9veBjaF9Xb4eo74KxXvyK6CoVRAoGBAPB568DcBAxwvRx66F1G
+      a5aZpmhnWs6DpVSQUFLS7iaQRztarp64t2LuadNPIs8lnO9pneW4ADGPojg/2U+m
+      5Wz1IiZ+QbXIoKLTikqMhgTWJMtNB0+JpuYu9uiyv/5W281oEBxJj8gsrH1j0CHP
+      3nlejHvVerPl+/dO1hpPZuz/
+      -----END PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIJKgIBAAKCAgEA6eN3FHFffFVyXFTYsF5ARxUEEOSODqe6o2GPKRVHhGaDPrIG
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 252710e..df2bdba 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -653,93 +653,65 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGVDCCBTygAwIBAgIQTs4jNfKb8/YyxYBtUZPQMDANBgkqhkiG9w0BAQsFADCB
-      kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-      A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-      BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-      QTAeFw0xNTA0MDIwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMFQxITAfBgNVBAsTGERv
-      bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxGTAX
-      BgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQDwvMa2z8biMMCkq9whwuVG9pRQn3ebohFGcyOa4c7PDqFHwTVCDmK4
-      8Bq/7w2PC+meQ5NV1Bm6GwWYB9qpRcrmM7VM69Ee8ttp4rKnCk11EO8cktvvP+Ea
-      kKkdaXxLI0BKPzl5RJaFfb4xggHL96cN65ZcVDW+ghloKGsZxwTOQOUfBMksgPQR
-      pO3XzM5BDlWm122gKyRQPWMoXoTOWDmbzydX2sgpZ9jxoMbzAQ9JB7Vjwoz0lqj8
-      94ckXFLDV7qdYWfJHyQNERCqa1rCovIFk61HbCqutfKw//atiAw1NinBUAa2em2i
-      PdKYWpubTAGeZ4MWzgpwg9+5ynUDf3p1XXNAH3R97Y957IPTdAqR4dwShG//xIL7
-      PQUL9csZadMfzlln9rjpNhRTfWiNkB3TA4mUhzvpmpJSp+b6xYpkYgxNQOoscAvk
-      Sz2pUkJFmDXrBnbz8cRD8mD4NRxgif3fEPce3kT97BoDyXL1mX2Hd2nVF2ayjfTQ
-      ZwVjLpV/Hw/MYwJdjxckUVRYHaBbF5i3EbERhtBEOemoHN9hhoiu7nFw7xvu9CuA
-      F3OqoM6E3PDbUDq++XLkpDvdlAscF+RZf9fdhGfe4GmBm72iKHb3e3N4xpQp1Phy
-      OazAFPC0eYoCmDnozL+tkT1guW9gFZ417ho2TggKqu/w7xyuFHxQ7QIDAQABo4IB
-      4zCCAd8wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYE
-      FMOFwfy0IZteBeE2q8oMNaiAvn/AMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-      AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoG
-      CysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9k
-      by5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vY3Js
-      LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2Vy
-      dmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9j
-      cnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVT
-      ZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNv
-      bTAxBgNVHREEKjAoghBkZW1vLmJpdG1hc2submV0ghR3d3cuZGVtby5iaXRtYXNr
-      Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAHzH0R7oXFBzVMCTzxnuU7wHRwIp08w24
-      kjSVzEm31jBHfeq4Eg03Gg9nu4TcGzRvUisziKjq9Ew9OuoQAerqmlL4WyrX5bfH
-      eBdn8qTebTVktqyQXyfI2uOsYmPK+tL97gbCoMMdGirrbi52Wg3HX+J6IP9lZ9iP
-      DStF46CjJaRNRib6J1XSuFPQ3Lf5Ae1RcvSSsZ1nOPnrhW7X7TKbl6sAku1VagfE
-      OEFYUxn2E3rB5wRwaG+SS87nNehMocPqdueW2bTd+f1dVwbhaCjjmB/piD3i5Jy1
-      /4rWOSQXA8zMEpmUOar4WBIEQfkrfTC2zbCyaHmOa+3glxQDeA98oQ==
+      MIIFTjCCBDagAwIBAgISAyZ/0mn21/5hlpfWr8/8vkiuMA0GCSqGSIb3DQEBCwUA
+      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA0MTUyMDExMDBaFw0x
+      NjA3MTQyMDExMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
+      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUVDyzYl9hzmemkMiSdBZULJjLreFd
+      ctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpMXdqoQSZvgTXvGTWl
+      s2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajFitRtDRxc4UOP2Zr7
+      cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oawtgTcmS5gu5yNVyNi
+      +saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo58dJHFRRCLspVg3Hb
+      xVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys6DEmkbpLAgMBAAGj
+      ggJbMIICVzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLLY1bGw+EdNB0rxXJgvyfiy
+      DA+yMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
+      BGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0
+      Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
+      dC5vcmcvMGUGA1UdEQReMFyCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
+      dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCGHdhbGxhYnkuZGVt
+      by5iaXRtYXNrLm5ldDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC
+      3xMBAQEwgdYwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3Jn
+      MIGrBggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUg
+      cmVsaWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29y
+      ZGFuY2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBz
+      Oi8vbGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IB
+      AQAigffcKH59L/3CGBSWvStKBITsY8DYA4VZpxK5k+Kabs/ZDbnWVF8+6pEMF2/C
+      +WO0MTQJHnWCI4oCNPVLaVqaOMUI2dGuc+EpjSnrWEf2osnbNM7x5mI1sHoe+vVL
+      zCFP1Ebr6S3iSiQwsZZUGEhX+8PW9dW2rVjMh/QGn/+AD9cpc2ZAeOP67F1/SLPx
+      NcQVYwOjqXf0mIZxxAMIZytwhw++PNaZjaBwaoOWGLGEnMzFVZSr10lV2yuj0xyh
+      1Axtal6l6P2u1iBa1YRxUYqawyGYc+3D+cXBjK8iJ7KwItOorDq8jGTPP2Ueal+h
+      qsywV+VNgNB8AsMUHf3Q4+8Y
       -----END CERTIFICATE-----
   commercial_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
+      -----BEGIN PRIVATE KEY-----
+      MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUVDyzYl9hzmem
+      kMiSdBZULJjLreFdctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpM
+      XdqoQSZvgTXvGTWls2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajF
+      itRtDRxc4UOP2Zr7cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oaw
+      tgTcmS5gu5yNVyNi+saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo5
+      8dJHFRRCLspVg3HbxVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys
+      6DEmkbpLAgMBAAECggEBAL+orgYqdPifTNaAeFwiZ4lhnCa2dOhaZMflb8USMrE1
+      joH0moPQYXdWRVDzMlMrdf0w1KY1g0I0lEBss5QPAvfBxYJm2hMRY0NZ22W8/9N5
+      UN2GkcmtlPi47HndIKhk0KY1Su2L8/jHzkVKNMee/wwj1k2B2jC+j8DSCYCGChxi
+      zLbleRfjMfjW/wmZuP1K83QxpVgC76G+yC2IE2gYnNc2OvhMEt8Rxcl6JJDQj23k
+      4WEg1q3BNbP+Wtk7V2DDUZki3RomPi1ZyeXUjWQXMjrMKfy5EAcHgs+zAF6z69B3
+      AcOCFr+HKMYf5ZWDd2QpgxO3DD1UZlHnUaHWedlp+zECgYEA84IG9ROPXUhdpJ2+
+      kySVliol2RzZr7pvmwjEI3wuegE4DpwTnJQUAFbgaIUsWtJICt/b4RgslQVdxjpF
+      l6KDCumZKJR1q0xnDc+B3q/BXbNVcG76xIp6nSdmfy4gf+4eEYXdBzVzW89BkSaU
+      O49KS8Vqbyr3/FHfMbNOv4lDabkCgYEA3zi9cOPRJg7/jw6n9bbetcNnKC/lzEAd
+      JWi4LZ4BWBCM3ucaShfdNh32jhJAZanvtHJes4VQZDjPBT8PEYXKmwkYIYtMP75A
+      6c1zwAWxM8yc/zXUh6sN4bKtGvWdACdtFqBSL0iBSM4sRgVVNPwE8Y5Odigv1JKA
+      hHcbxFAXdiMCgYANiiFQ5zGFgkySpqK+E76thtJr7Aq+lqM1/5rITlNXPVIcndkJ
+      T8J88lev+BerRR30XNYhAfMYph+8sejEsaiPpsV5WCfiynDAd9VEyIj76MjLY6BV
+      5U1EB7jPQYVVF6xcVREhIXu0kyWWKIr9dM4wwF1WqRD42qSKYunyBHPXIQKBgAcc
+      n6yBFaDIyYudQ+yoLuBLoXW+UOv4/vS6KWQKrLBJlrNjWYsSx5F50ukj27lheKmf
+      GzVNAgqvZKkeITTFtnbKC2LGNV+yiA7q5M0xYTvtQPNAm8zWvlJ6htldCet/VhJq
+      eTPYc4YGS5LPiK9veBjaF9Xb4eo74KxXvyK6CoVRAoGBAPB568DcBAxwvRx66F1G
+      a5aZpmhnWs6DpVSQUFLS7iaQRztarp64t2LuadNPIs8lnO9pneW4ADGPojg/2U+m
+      5Wz1IiZ+QbXIoKLTikqMhgTWJMtNB0+JpuYu9uiyv/5W281oEBxJj8gsrH1j0CHP
+      3nlejHvVerPl+/dO1hpPZuz/
+      -----END PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIJKQIBAAKCAgEA8I75bXMsfHLaUpo5A7RixrEnVuT/esg4+YmU4WZYOCubCEU/
diff --git a/secrets.json b/secrets.json
index c78043f..d26a4ec 100644
--- a/secrets.json
+++ b/secrets.json
@@ -62,6 +62,24 @@
     "scramblesuit_password_hippo": "GZ5FI5KQJUZVSTTYOI3XESDNOVEXQR2K",
     "scramblesuit_port_hippo": 28975
   },
+  "local": {
+    "api_monitor_auth_token": "TvVfHEhktFCmqyywXsKDDBpUqH8wYtyS",
+    "couch_admin_password": "uAqjgTuHJS7dxFrURQTpj3mP7J4bpBv7",
+    "couch_admin_password_salt": "328baa6dc4156d0582e27992466a6fa5",
+    "couch_leap_mx_password": "ULnBpUQjXpP3eRyZaCZsFPm52adTS4jV",
+    "couch_leap_mx_password_salt": "af8d2e11cf00e06b5312b24ecd5d9a75",
+    "couch_nickserver_password": "cTjvgSQLtwWY9wCc9mXaHuPMRWRHgqDC",
+    "couch_nickserver_password_salt": "3682d364cee6531ce0d6dff847c26ae6",
+    "couch_replication_password": "3W2eu4zmpjSpnz2cvRudjb75cZguXMCe",
+    "couch_replication_password_salt": "a8142baab11794630efe1f58beaddc6c",
+    "couch_soledad_password": "w4m5KuZquAWJZRKJCbeH27h3XeVTzI53",
+    "couch_soledad_password_salt": "409045c3bc51599e0c92e437b24db0f2",
+    "couch_webapp_password": "VYVDRZc8frfx7H4ePJEHhtbDMnvAkW5S",
+    "couch_webapp_password_salt": "ae8676039ca109107f6293f3483d1afc",
+    "nagios_admin_password": "PZIJAMayxImLAtD2rIfuLpRcxL8xeVY2",
+    "nagios_test_password": "qA72A3pVmtLFnenKqD3rZ9RVhceczMzS",
+    "webapp_secret_token": "Kk4QMTzcgbf37CSVkjU7AgDHBHZeWMcK"
+  },
   "mail": {
     "api_monitor_auth_token": "vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2",
     "couch_admin_password": "5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw",
@@ -81,7 +99,6 @@
   },
   "unstable": {
     "api_monitor_auth_token": "AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR",
-    "bigcouch_cookie": "hBwa3HkByLdjDZ5LdkwddTvk7XITIWHc",
     "couch_admin_password": "LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ",
     "couch_admin_password_salt": "b9d35fd378ba1598e843d5a784cfdf7e",
     "couch_leap_mx_password": "C3L8QnFCMpaKGQghMAW9gERSmhAuNvfC",
@@ -92,8 +109,6 @@
     "couch_replication_password_salt": "01a82aa87990d967cfb81f3ff32f8095",
     "couch_soledad_password": "35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf",
     "couch_soledad_password_salt": "7f725f3cc60c388e9af8140555e09dfa",
-    "couch_tapicero_password": "LhRqFb88ady9dDEuTyIJMcEUZSnmyLrH",
-    "couch_tapicero_password_salt": "3160126c5cc3780acfd3d2edfc78d1bb",
     "couch_webapp_password": "enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew",
     "couch_webapp_password_salt": "478bf7e8ca879a9711b279055f00153e",
     "nagios_admin_password": "r35FbwIuktJZXFfbnrVxCh8StDnIzhXj",