removed disabled nodes: starfish, snake, wombat, zebra, deer.

added mx to snail. added dotterel as tor node.

32 files changed, 494 insertions, 934 deletions

diff --git a/files/nodes/deer/deer.crt b/files/nodes/deer/deer.crt
deleted file mode 100644
index 872e642..0000000
--- a/files/nodes/deer/deer.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFqjCCA5KgAwIBAgIRAKe0LoxKAOEqufGfe1jGE+AwDQYJKoZIhvcNAQELBQAw
-SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MDkyMzAwMDAwMFoXDTE2
-MDkyMzAwMDAwMFowHzEdMBsGA1UEAwwUZGVlci5kZXYuYml0bWFzay5uZXQwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYgLaOKk7pw199CRE+ox6Rc862
-ZKcRZAXpiEZDEQlAYiZoeKZTPYA7EzIGyQ0mPMnabnVs5KrqRAm7bUo2oB8C9zX/
-gVfpm2e7jEqWMVyJZ6LljjtJHOS40AdJsXeBLPSl/iPvFWczeFbiEfc0ClYKt0E+
-rdD/CYEaB/sHMnyIMMg2ht16CBm6bZhKTxTGgr+yjN9dnYOK9L454nQchsxwTB5P
-ghWlpt16QAQiVr7SH9NQIWdtSFnGsjmXHi4VAXL2fLz3DauP0ptE/cyYwSiXwmBn
-tQfTl9iwTdGDy7xv8Xxsy6xWUI6QQ9vUkI/5y5sdgDPmLlg/AifH/ISo/+ethca9
-UKzczf7Ec1tvGQgpY3iBxqXxz2FO+fJAAUq+sTL0c+3ochzd8bmogzbveL1lHXN4
-noJHgVKnRc6JI8edbsV7o8vFG66zT5ryqgWS8SLHLPCY1u0iIwMtSAnStNnPIzvQ
-75UQUmVKhkEyP0xs+LHPRWg8EjeP+MEgBoE6dpceOQg32w9fjogepXvS/mkz8Hqz
-0XleCi5wProNF3mT+nNuJNw5qVjXYDZJr5taww12dzGQVHcCor+sCnoquD2O75m4
-pE5nJgUbakauZUv0ME4H1smLowbTef4/IC5nLYVj069uh9irsuRsMhkAl72q7D9I
-7UtN6IsrpeThEQEHuwIDAQABo4G1MIGyMB0GA1UdDgQWBBRJCizT8WORbtAJ4Wd/
-FuVr3msGpjA5BgNVHREEMjAwghJkZWVyLmRldi5iaXRtYXNrLmmCFGRlZXIuZGV2
-LmJpdG1hc2submV0hwQl2vBlMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdik
-ce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEArtH3pwGT8WXGxagU982LVCBX
-HubMrepes6HU3MIHMROqWILI+MFPyd7uq8tiDmFYZNOhDK3qov25ver3oj0aHrpy
-xZn7XePbzhVp5WI0SWXXPkZj3Ppb2ZeORpVIXvefURB1Y9Vt+mBgVONKmGeU2le8
-mNLkw4x3dPCZJf6338tuj/PxBImkWbLz7kblaLDcFULSa3L2bjrYV3/Ds7FE8GVU
-n/apJQnp1TtO+HLDB0pMbpduU6voLeUskP/0Rlzn/o6NBmOYBKbtSPc97mXiN0bO
-ztpB2MHfesE2b46KslAvK9s+LBr1yysAa7fgMoLNUdFQ//9w24HCFIpiqrLM3NyC
-irpxyh/2i/71Smcjm9w9vZiiBAi7dRD/FeJ2mZMr58C5wihcUtEBRc14ruajaC2A
-2rO2Qb+v4xS86/stM9Caz/1qHjuKpmbUf0YpW79KAtj/FfqpPb7hfpfNXdhscYtd
-HstUnN3XQBkaVR+LLyFDNgqpZD5MH9KXjPMSEPZi6j9urFvNvDgwojA5uO6HHP36
-NZvr5sNS6UYnNrXNp9nN47dhXcGsJtAZDU5ouzGgVnKMesXLlKBF7rJF3lhCbdUZ
-OLbNBKG55ZYgCLLZSbOFtqsCccZKcztyRedhbQjdvXA4hUMPo9QDfnAFUAKmnJrS
-7A9zZsjacHHousQlhXg=
------END CERTIFICATE-----
diff --git a/files/nodes/deer/deer.key b/files/nodes/deer/deer.key
deleted file mode 100644
index 6434870..0000000
--- a/files/nodes/deer/deer.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/files/nodes/deer/deer_ssh.pub b/files/nodes/deer/deer_ssh.pub
deleted file mode 100644
index a12e989..0000000
--- a/files/nodes/deer/deer_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFAlVLkQ2644Lq7HCw6Sf7dxNNAXzkNg0owBqwAMV73OFeFZJadxQENQ/9bJKKQSst7LBXnlNNW4IDnVu1Hc9p6iWDfxFxUqzz1PJQcZy6qTOQXcMR59Wd6GEpXtjjWeKD6N+LxIJdtUYajHEbet7mF9SeZUIN/f1JJ8SetwI6GZeqLywvdeLlVl4CvRZ0EePazsYY6rkGRMaZeNYfY+bUHtY67eth/tO1gEvwnXkYCIkfVxYHruOxyGENPimI8tW9dSuTF8yxwfuyJlPldgYs0Oln4o4rE5/694UiGZK+NUbtansNgE2BrTUv9aeGjohRE9G+6Pjidsm5cxnnEwPd
\ No newline at end of file
diff --git a/files/nodes/dotterel/dotterel.crt b/files/nodes/dotterel/dotterel.crt
new file mode 100644
index 0000000..2a23ae0
--- /dev/null
+++ b/files/nodes/dotterel/dotterel.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIQZB0B4Jkqh7qRXev4joux9zANBgkqhkiG9w0BAQsFADBK
+MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTYwMzE2MDAwMDAwWhcNMTcw
+MzE2MDAwMDAwWjAjMSEwHwYDVQQDDBhkb3R0ZXJlbC5kZXYuYml0bWFzay5uZXQw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDY277Xea6ozN/Wk613Ux39
+8pX0cVw8mN+D1iHEy11dQ83tbXm4Wi4PTM+8LX641Mhr1L2sBZ2vFUf7/E13OqvL
+cI4z7LydXVMYCp8NolVt8QOtBMO2cEO7OlAQcwOMUMwyjwt2CWl4QyQTBOriOndz
+J7qNODkuroiOlqUObGwe1J3arg/b4qKT5SUDRIN/ILZYoVsuB+oMn78aYZ1LBpCd
+0vGxyPuj8SKwtvqw05byJAH+uFAZpmBEk/45cRDXRhU36mGh/xzvV8/S5q/b1ehA
+IRkgW5i+MqBz7Mp7w5UqY0dZYTObrf+6qwb0rzchB2c+CcIBkeGibpOtMfhrNURr
+aJUYisQ9v4hWcVsstp73yzNeaR+A6advrDTizGpV4HxKxHauaCMcvGBAF+OpH9mY
+06lbjyFaBA7H+0a+snH51S4oyKZ1bsDTZbwOx1fRmw942JosIlYPm2Ll6rhDXsK3
+3+whw/8u1qGTgll6M4TgZ35kUD7QjyRcKroo7oGMKm3EQfERbzmbVhvQC3Rk7Ncw
+mPRt1/ovhGUKag5gRacuP4ZpqCF/ipWCU6gG5Zi73j2Qgx0R7XKqcwzDCTrAr1u7
+ATxpJ5nCU+H0LgpBeTbI5eSO6p2ZOLkg/Ppa/yxHXhQoSnt3GrajkuojfgHV4Q93
+GQyg6BIqYwgIkFCylCdOxQIDAQABo4G9MIG6MB0GA1UdDgQWBBRKBy96ZsdpSM3e
+X8QrF0wp/1Y9qDBBBgNVHREEOjA4ghZkb3R0ZXJlbC5kZXYuYml0bWFzay5pghhk
+b3R0ZXJlbC5kZXYuYml0bWFzay5uZXSHBCXa8DIwCwYDVR0PBAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaA
+FLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQAO6fbIuKgc
+SQ3msQMv+ZhWipRiqzOZojknxlAl8tIZh0NFnNxCG4AOBpkZLslFTRfeNJXq9R+f
+WNlePIl2DW+R/QwISiP9AwyVToXsN/i7OSIJlr7YZ/zWhhbx5FJRMDUO0qSNhiyf
+HowDIU6dpkqF4NgD/UliP4mNScOXCmo/yYnPAhqP/qScX1YbkqdcrWzYgFsoy+V7
+PXqPbB7qCirKyZQIFKYOgw+AB1nUs4NbVobOSFeaXZCrsNf1zGEB0HzPEi/7ERsj
+SDpkf6GaSv6iu0X0Pxh8Xtmxwr2ZE90DIumTZaEpw2jByVToRgWWbnnl5gSbjne3
+mUyEVpJ09tSB01h1BS+yDcsly0BkpfSWq5lRayhWehIKY2P3ael/ourHVGEEOiTJ
+urmsNMB31/STjc+mUt44AYPFJMRtAsLRzfKyL7Zt2NFWMDLn5ahxYcxY/482Hd89
+B2zMfyIRgOx30wxcKvTvJNsUBrQ/ol8s2IcS+vG/E3ZdaCddI0IvFbUp2d/DBImr
+p8AYrjSxy/Nkbn4Ns+KlchAeZRmjkQDIIrri4a/LA32WucVpDSp1bjKq+mMQyn0l
+CgphjY4h8XFlWzZAHjz/2k6+gB+mOjl+L19SaPurs2vPzJTh3Lkc+KA0YjmP/kes
+AXTkPpOLe7jsJaa9K/dH78U2Ptr+ZfaRGw==
+-----END CERTIFICATE-----
diff --git a/files/nodes/dotterel/dotterel.key b/files/nodes/dotterel/dotterel.key
new file mode 100644
index 0000000..f66ccfd
--- /dev/null
+++ b/files/nodes/dotterel/dotterel.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/dotterel/dotterel_ssh.pub b/files/nodes/dotterel/dotterel_ssh.pub
new file mode 100644
index 0000000..5dd9a3b
--- /dev/null
+++ b/files/nodes/dotterel/dotterel_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR
\ No newline at end of file
diff --git a/files/nodes/snake/snake_ssh.pub b/files/nodes/snake/snake_ssh.pub
deleted file mode 100644
index 7567107..0000000
--- a/files/nodes/snake/snake_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKbMHvg8E/L/xYUXCnnIFEeZmS8+7cjfbkQrEuyGdzkTjTxW7v/7AnEmN/mcWyzR8qGrsF16M+tWagZ8EAQV8j4=
\ No newline at end of file
diff --git a/files/nodes/starfish/starfish.crt b/files/nodes/starfish/starfish.crt
deleted file mode 100644
index 91e86f0..0000000
--- a/files/nodes/starfish/starfish.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFtjCCA56gAwIBAgIRAPcMnIqKnc2GBIpTbj5MhWQwDQYJKoZIhvcNAQELBQAw
-SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE2MDExMTAwMDAwMFoXDTE3
-MDExMTAwMDAwMFowIzEhMB8GA1UEAwwYc3RhcmZpc2guZGV2LmJpdG1hc2submV0
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw/ugkwIUSZSoneleGJFQ
-CQhLn8vKFC2j/08Bc2rmDXVlTkl16flMnQi7d5d1MLiIY1oOzE6MjfhtP+unqZkW
-0ADuwGNCh5LacOBXo6nzFOMZuLBPDLlZeLiaOVXyuJIHbY3dAHpKcH88gHOFqLn1
-z5GEi8reXsrtvrsoAsak8Nr5u06ScRiW7je4t4NwjCrHq3Zd8v2vWAjiY+DqsxS4
-3YmdRh4keY8H2u6Tzt3E4yB3H2okQW/E5H601u17rp23y61mtqKAm60hBk26wtOb
-ZYS2ez5DHaApK/HrsbXmoO1i/WZQsoXw5YNiBXIyotoZoY37ffCqOeeqCuDETbDm
-3g1cMYH8975cSlH1B3wj9NnctGVgpCShCk62OCnjeCJusl+UDG6hzAbcz73zrdxZ
-sq8R6rk61CR8rjSmEH+PrtqrLkCYmCNHnMc982n+OlJjc1aBmz32bTQZatsqPd+p
-o8e3rkSsWb/D8vvTpKlhc9JkxG7+nnzsa5RUyv7YusuDliT+Zibk3aWYnoEeahTt
-gmVC5SPNomXAxj+oCoyjM3aUqYBG5NARI5MyFJ6NMHKeuxcHJWu77Z0Ek/W2O/vT
-Xpyt3txopQu5iY757D0gCuDu2aAzbZqtGimDRjcdf6Fz4uqlC+7+VJ7Mt+/eH87M
-exXf3ayMeF9OAeCSxHHE05kCAwEAAaOBvTCBujAdBgNVHQ4EFgQUMs3/UkPKvMN2
-qXUUhZkbwHdKuT0wQQYDVR0RBDowOIIWc3RhcmZpc2guZGV2LmJpdG1hc2suaYIY
-c3RhcmZpc2guZGV2LmJpdG1hc2submV0hwSwNUUXMAsGA1UdDwQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
-gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAPp7oJYOO
-fEzR4W9pnJP3SR9LyhgiQmc9w8wfbgWjqI9UbCjSpZ/3oPVEwBSDvcrjSiY6q7Qj
-8omBVZssP1uOr8IRzhYGJ0dpzDjUuHJ4geH1BgQFiVeAatw2zk6zSFuq88RVm4Tf
-6dRuVsO/DnvemTiL38/CiFm153GEuERSElCj1G/0hI54HvKsb8yx7q6u6fNPtb1n
-G/bJ9t+rik5hP3TitHGrsIbcHT0pNulzqEr3zgFyJy4Z2Fz7ZgquySAkKqRX8KUu
-A+aB47U3s9tfxJVf4KwuJ+pcqaJ1ubeG8BChGW2ZIPx+Z47ZFepGW+WIV/Ol1HLP
-bZhoNRws4dDf2CJuDSZsLIKLp5ZNvOTvakXLqvtBplNcp/U0P6wmviFauFCD5Uvn
-vJhe07wUf9AkWNnSuPLadbIqqkQ6NR3Sykw/maBSCmfeeM2A6dFsZ5su+at1iluo
-vCYiYiLFKm2nb850YLzk/e7h1XmJm9TT0uILX/A7Y5pIA6YM9LQvgMwdCxkwILIg
-YT5t6bqHJb5FpXASjBeSJgqe9QoTQGCkSRk46xK7JQlnP+sbpE0mi92iuQE3spy3
-cKFCbR8B7+rj+9Qg/H4JNz1G8IFI3QDJOFs+tDSzRcWzc+eDhjNyZAzEiTEyy1Tc
-paXtHuVV60HByQUM49ceQgpITgrtgCg38dM=
------END CERTIFICATE-----
diff --git a/files/nodes/starfish/starfish.key b/files/nodes/starfish/starfish.key
deleted file mode 100644
index 0bd9c1a..0000000
--- a/files/nodes/starfish/starfish.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/files/nodes/starfish/starfish_ssh.pub b/files/nodes/starfish/starfish_ssh.pub
deleted file mode 100644
index fed5ac5..0000000
--- a/files/nodes/starfish/starfish_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh
\ No newline at end of file
diff --git a/files/nodes/wombat/wombat_ssh.pub b/files/nodes/wombat/wombat_ssh.pub
deleted file mode 100644
index 169facc..0000000
--- a/files/nodes/wombat/wombat_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBbI0max4O4x87XapsBdLzQtaVj46KDAPrI33RtpFI1MCfd1mBbxVxIBlJDiuXZlYVZDdNCDt3XzDv1nNrjzssc=
\ No newline at end of file
diff --git a/files/nodes/zebra/zebra_ssh.pub b/files/nodes/zebra/zebra_ssh.pub
deleted file mode 100644
index 34ece57..0000000
--- a/files/nodes/zebra/zebra_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJdDj+3mEkAdzvIKH/pQAI4M1myzrqmUZIdnjFiVB9wZnWK0i439v4D4WFFq3iXQ4QJTolC64U7JxTL6tpbUtoI=
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 238028e..cb52f3f 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -8,10 +8,10 @@ antelope,antelope.mail.bitmask.i,antelope.mail.bitmask.net,199.119.112.167 ssh-r
 cat,cat.unstable.bitmask.i,cat.unstable.bitmask.net,199.119.112.206 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV
 clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z
 cowbird,cowbird.cdev.bitmask.i,cowbird.cdev.bitmask.net,199.119.112.152 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCraaEPNaV43AZ2N0zlxwnGzaqsSU+sBtz3PlId1NZqYv27UYIXw1WKPPhLbdfcVQxM0pVSsTZ8hsfztGrRn9yW1JNzp59GjRxenOzCVen08YLlY9eKEI3UNB8nMh4HuVWxQGOiaqovCN3e0KcwImD7J35eOW14NCQ8zvzVHwIL/VhO+wpQ6ofJ0pFP78w/EZ/arbHIM4teWyRGJzcBe++kFqWoaj8Yxbdgo2ZW4iyqCwpaxLk7KHM2op/FSwrEs/cnlwyCq+xjP3QLjDT2TRgwEQycTGABhcqrJJ1SVo4sKE0DvjhVHsAy5OI296k7OE5pbGXn2ZUc2TsPUttdUajt
-deer,deer.dev.bitmask.i,deer.dev.bitmask.net,37.218.240.101 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFAlVLkQ2644Lq7HCw6Sf7dxNNAXzkNg0owBqwAMV73OFeFZJadxQENQ/9bJKKQSst7LBXnlNNW4IDnVu1Hc9p6iWDfxFxUqzz1PJQcZy6qTOQXcMR59Wd6GEpXtjjWeKD6N+LxIJdtUYajHEbet7mF9SeZUIN/f1JJ8SetwI6GZeqLywvdeLlVl4CvRZ0EePazsYY6rkGRMaZeNYfY+bUHtY67eth/tO1gEvwnXkYCIkfVxYHruOxyGENPimI8tW9dSuTF8yxwfuyJlPldgYs0Oln4o4rE5/694UiGZK+NUbtansNgE2BrTUv9aeGjohRE9G+6Pjidsm5cxnnEwPd
 demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2iNuS97BTd7flA/8nho/w3+THNriQPf1IpgcI/TCaTxIG5T85FRIApNAIxayJjBAt9C/MM8LMUlpRTq1Y8vlpYmfcWAJj5V8bbP03TXNIkgK8rtStjN061bhWXo4AVfD1hFyL+wUrdGRX2laaJvOgMO+UCkYb9PPqEfyKCMhcu3Da7auznYucrNxcJwCU4TpVgmQDYE0DWpYkssTbGJ7YJOZAtwNWtOrZFVRzOvMy3WvAM/s0x/ME6CQi6k6dDHlSpafhPAl/B4koTtnPksmXc7xCpmaun1j68C0yvD1l9QBPKyFwJ1KCJgx+9++CqnSFbIbX3ebb0FGtMHrak2xL
 diplocaulus,diplocaulus.bitmask.i,diplocaulus.bitmask.net,199.119.112.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpvETs31Zg2omqF9k3dq/CJDnZtrd+987VJgWex/zM/ZsRu7MYoAb34BBm2QroVwAiei5Wczn6CpdcYUuY38fdCxUVRKClm0abz0T6LT/EsqfY3N1d9OmAjN/XEWi/5+vnaiEuh313XUgD2vASFwLR+z9NHlGmz+uBaQLWRZF2Q36i2L7TOOxUG96i6knShNIGmaajVNhv078EtJlWbNzpEcVsn6CyRhyMdx0KzV2tIvitozwHcAy5UEQGGiwACxHwOS9IWn7UBHhfxf1kj1VVmnrewf6TnApvuqD8e0d9z+NnWOt9h3HAFxF92Ggs4FQ/vY7EcxgaEoW1kroGiNGP
 donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl
+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
 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
 goldeneye,goldeneye.cdev.bitmask.i,goldeneye.cdev.bitmask.net,199.119.112.153 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0UeOcj5frFsFK6CxTojMr9M/Fg3/3yBmsMtEP/wGiEZ1uTmbuYSzYUicashNPrQ3NnXEmLfmQbumKT1BL2p+EtN942poQSKA3sQWNemTErJcPr3vNN5vXXcXNoTDd8WmUOOnWMw5CkMv9kkgEN2jYfQNR1olofUn7eB5e9Iu24d4IaTupLzT+e3Jh+nkH5Uqw/JMmMkoy6nvYt9OmSQ+fvZZnuMatGSgOSpLgjajIvR115ga8QYEiQ76ugO+K+afvrSe5k8/puH+Xh0B5x1OlwxaGfIfYpi9IITdzMVvr/kEop7FG4184FehdlWS5DcUPZT5dicZLVlntelU+hlLb
@@ -21,6 +21,5 @@ millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecd
 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
 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
-starfish,starfish.dev.bitmask.i,starfish.dev.bitmask.net,176.53.69.23 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh
 tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUCLDyb/Gko3yY2CQNVa+25hQhlSufBLA5F4akkrSZ6/gCrZg/jCa+htftkCNd8INZOs2aETY1F3Fr2eMNlIk8dE5cNiSeQJsoxKa+Lbt0T5QPpc2D8vkd5wX0aF5hVFT5EohObNvtNIgdxIoriod8dDqF/F/w/8T1rX6VeEPIMmsh3vakYqA3ynd0GjRXADQjNj7uzpv/+pZfSr4GbWwQaTb/W+Na1JGaq2nrwGFATsogDhNzqJEhKfOP2Yb8dkMSV/mq9YCMoSXv1UaGDKF7+bmq3MKjXJ4qNWj5foowkvz/YP6HMqqY9zKaesyBh3rTgljxXI6b0Viumygbt3kp
 wallaby,wallaby.demo.bitmask.i,wallaby.demo.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ=
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 17ef4d2..70b9f8b 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -75,7 +75,6 @@ mynetworks:
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
-  - "176.53.69.23"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
@@ -90,7 +89,7 @@ mynetworks:
   - "199.119.112.208"
   - "204.13.164.171"
   - "204.13.164.57"
-  - "37.218.240.101"
+  - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
 name: cat
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 6a00287..ae7c34c 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -63,7 +63,7 @@ location:
   timezone: "+2"
 mail: 
   smarthost: 
-    - starfish.dev.bitmask.net
+    - snail.dev.bitmask.net
 name: clam
 platform: 
   major_version: "0.8"
diff --git a/hiera/cowbird.yaml b/hiera/cowbird.yaml
index 9a556ba..6c62ace 100644
--- a/hiera/cowbird.yaml
+++ b/hiera/cowbird.yaml
@@ -72,15 +72,13 @@ mx:
     selector: babcfe98e4
   key_lookup_domain: bitmask.net
 mynetworks: 
+  - "1.209.122.123"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
-  - "176.53.69.23"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.12"
-  - "199.119.112.149"
   - "199.119.112.150"
   - "199.119.112.151"
   - "199.119.112.152"
@@ -90,10 +88,9 @@ mynetworks:
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
-  - "199.119.112.8"
   - "204.13.164.171"
   - "204.13.164.57"
-  - "37.218.240.101"
+  - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
 name: cowbird
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index c7a2ad6..a172e17 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -29,7 +29,7 @@ location:
   timezone: "-7"
 mail: 
   smarthost: 
-    - starfish.dev.bitmask.net
+    - snail.dev.bitmask.net
 name: demodex
 platform: 
   major_version: "0.8"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index fe19a55..8944141 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -219,12 +219,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCraaEPNaV43AZ2N0zlxwnGzaqsSU+sBtz3PlId1NZqYv27UYIXw1WKPPhLbdfcVQxM0pVSsTZ8hsfztGrRn9yW1JNzp59GjRxenOzCVen08YLlY9eKEI3UNB8nMh4HuVWxQGOiaqovCN3e0KcwImD7J35eOW14NCQ8zvzVHwIL/VhO+wpQ6ofJ0pFP78w/EZ/arbHIM4teWyRGJzcBe++kFqWoaj8Yxbdgo2ZW4iyqCwpaxLk7KHM2op/FSwrEs/cnlwyCq+xjP3QLjDT2TRgwEQycTGABhcqrJJ1SVo4sKE0DvjhVHsAy5OI296k7OE5pbGXn2ZUc2TsPUttdUajt"
     ip_address: "199.119.112.152"
     port: 22
-  deer: 
-    domain_full: deer.dev.bitmask.net
-    domain_internal: deer.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFAlVLkQ2644Lq7HCw6Sf7dxNNAXzkNg0owBqwAMV73OFeFZJadxQENQ/9bJKKQSst7LBXnlNNW4IDnVu1Hc9p6iWDfxFxUqzz1PJQcZy6qTOQXcMR59Wd6GEpXtjjWeKD6N+LxIJdtUYajHEbet7mF9SeZUIN/f1JJ8SetwI6GZeqLywvdeLlVl4CvRZ0EePazsYY6rkGRMaZeNYfY+bUHtY67eth/tO1gEvwnXkYCIkfVxYHruOxyGENPimI8tW9dSuTF8yxwfuyJlPldgYs0Oln4o4rE5/694UiGZK+NUbtansNgE2BrTUv9aeGjohRE9G+6Pjidsm5cxnnEwPd"
-    ip_address: "37.218.240.101"
-    port: 22
   demodex: 
     domain_full: demodex.dev.bitmask.net
     domain_internal: demodex.dev.bitmask.i
@@ -243,6 +237,12 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
     ip_address: "199.119.112.207"
     port: 22
+  dotterel: 
+    domain_full: dotterel.dev.bitmask.net
+    domain_internal: dotterel.dev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR"
+    ip_address: "37.218.240.50"
+    port: 22
   elephant: 
     domain_full: elephant.dev.bitmask.net
     domain_internal: elephant.dev.bitmask.i
@@ -297,12 +297,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD"
     ip_address: "176.53.69.14"
     port: 4422
-  starfish: 
-    domain_full: starfish.dev.bitmask.net
-    domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh"
-    ip_address: "176.53.69.23"
-    port: 4422
   tuatara: 
     domain_full: tuatara.unstable.bitmask.net
     domain_internal: tuatara.unstable.bitmask.i
@@ -418,15 +412,6 @@ nagios:
       services: 
         - mx
       ssh_port: 22
-    deer: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: deer.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "37.218.240.101"
-      services: 
-        - tor
-      ssh_port: 22
     demodex: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: demodex.dev.bitmask.i
@@ -456,6 +441,15 @@ nagios:
         - pixelated
         - webapp
       ssh_port: 22
+    dotterel: 
+      domain_full_suffix: dev.bitmask.net
+      domain_internal: dotterel.dev.bitmask.i
+      domain_internal_suffix: dev.bitmask.i
+      environment: development
+      ip_address: "37.218.240.50"
+      services: 
+        - tor
+      ssh_port: 22
     elephant: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: elephant.dev.bitmask.i
@@ -541,16 +535,8 @@ nagios:
       ip_address: "176.53.69.14"
       openvpn_gateway_address: "176.53.69.19"
       services: 
-        - openvpn
-      ssh_port: 4422
-    starfish: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: starfish.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "176.53.69.23"
-      services: 
         - mx
+        - openvpn
       ssh_port: 4422
     tuatara: 
       domain_full_suffix: unstable.bitmask.net
diff --git a/hiera/deer.yaml b/hiera/dotterel.yaml
index 5170b83..69215c6 100644
--- a/hiera/deer.yaml
+++ b/hiera/dotterel.yaml
@@ -7,21 +7,21 @@ development:
 dns: 
   public: false
 domain: 
-  full: deer.dev.bitmask.net
+  full: dotterel.dev.bitmask.net
   full_suffix: dev.bitmask.net
-  internal: deer.dev.bitmask.i
+  internal: dotterel.dev.bitmask.i
   internal_suffix: dev.bitmask.i
-  name: deer.dev.bitmask.i
+  name: dotterel.dev.bitmask.i
 enabled: true
 environment: development
 firewall: 
   ssh: 
     from: sysadmin
     port: 22
-    to: "37.218.240.101"
+    to: "37.218.240.50"
   stunnel: []
 hosts: {}
-ip_address: "37.218.240.101"
+ip_address: "37.218.240.50"
 location: 
   country_code: HK
   hemisphere: "N"
@@ -29,8 +29,8 @@ location:
   timezone: "+8"
 mail: 
   smarthost: 
-    - starfish.dev.bitmask.net
-name: deer
+    - snail.dev.bitmask.net
+name: dotterel
 platform: 
   major_version: "0.8"
   version: "0.8"
@@ -116,14 +116,14 @@ tor:
   contacts: 
     - micah@leap.se
     - sysdev@leap.se
-  family: "deeruSaR9IekHdQGUGI,otterbagtc8Z3KPmfnT"
+  family: "dottereluSaR9IekHdQ,otterbagtc8Z3KPmfnT"
   hidden_service: 
     active: ~
     address: ~
     key_type: RSA
     private_key: ~
     public_key: ~
-  nickname: deeruSaR9IekHdQGUGI
+  nickname: dottereluSaR9IekHdQ
   type: exit
 x509: 
   ca_cert: |
@@ -161,92 +161,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
-      7A9zZsjacHHousQlhXg=
+      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
+      AXTkPpOLe7jsJaa9K/dH78U2Ptr+ZfaRGw==
       -----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/elephant.yaml b/hiera/elephant.yaml
index 3fe5e6f..2c24687 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -94,9 +94,9 @@ definition_files:
   smtp_service: |
       {
         "hosts": {
-          "starfish": {
-            "hostname": "starfish.dev.bitmask.net",
-            "ip_address": "176.53.69.23",
+          "snail": {
+            "hostname": "snail.dev.bitmask.net",
+            "ip_address": "176.53.69.14",
             "location": "istanbul",
             "port": 465
           }
@@ -181,11 +181,11 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z"
     ip_address: "176.53.69.22"
     port: 4422
-  starfish: 
-    domain_full: starfish.dev.bitmask.net
-    domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh"
-    ip_address: "176.53.69.23"
+  snail: 
+    domain_full: snail.dev.bitmask.net
+    domain_internal: snail.dev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD"
+    ip_address: "176.53.69.14"
     port: 4422
 ip_address: "176.53.69.13"
 location: 
@@ -195,7 +195,7 @@ location:
   timezone: "+2"
 mail: 
   smarthost: 
-    - starfish.dev.bitmask.net
+    - snail.dev.bitmask.net
 name: elephant
 nickserver: 
   couchdb_nickserver_user: 
diff --git a/hiera/ferret.yaml b/hiera/ferret.yaml
index 2919a5b..cc6ebe4 100644
--- a/hiera/ferret.yaml
+++ b/hiera/ferret.yaml
@@ -33,7 +33,7 @@ location:
   timezone: "+9"
 mail: 
   smarthost: 
-    - starfish.dev.bitmask.net
+    - snail.dev.bitmask.net
 name: ferret
 platform: 
   major_version: "0.8"
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 9e416c7..a15d6af 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -72,15 +72,13 @@ mx:
     selector: babcfe98e4
   key_lookup_domain: bitmask.net
 mynetworks: 
+  - "1.209.122.123"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
-  - "176.53.69.23"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.12"
-  - "199.119.112.149"
   - "199.119.112.150"
   - "199.119.112.151"
   - "199.119.112.152"
@@ -90,10 +88,9 @@ mynetworks:
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
-  - "199.119.112.8"
   - "204.13.164.171"
   - "204.13.164.57"
-  - "37.218.240.101"
+  - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
 name: leech
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 8a1e07b..e024380 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -151,7 +151,7 @@ tor:
   contacts: 
     - elijah@leap.se
     - sysdev@leap.se
-  family: "deeruSaR9IekHdQGUGI,otterbagtc8Z3KPmfnT"
+  family: "dottereluSaR9IekHdQ,otterbagtc8Z3KPmfnT"
   hidden_service: 
     active: ~
     address: ~
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 9d20805..60363a1 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -1,7 +1,13 @@
 --- 
+clamav: 
+  whitelisted_addresses: []
 contacts: 
   - micah@leap.se
   - sysdev@leap.se
+couchdb_leap_mx_user: 
+  password: TISmwrYwSBmwbdDyQvJYu3_VkZmfZITc
+  salt: 79fd6d71c94a1aaf44cefc84a5a748dc
+  username: leap_mx
 development: 
   site_config: true
 dns: 
@@ -15,6 +21,12 @@ domain:
 enabled: true
 environment: development
 firewall: 
+  mx: 
+    from: "*"
+    port: 
+      - 25
+      - 465
+    to: "176.53.69.14"
   ssh: 
     from: sysadmin
     port: 4422
@@ -26,7 +38,29 @@ firewall:
       - 27889
       - "443"
     to: "176.53.69.19"
-hosts: {}
+haproxy: 
+  couch: 
+    listen_port: 4096
+    servers: 
+      clam: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
+hosts: 
+  clam: 
+    domain_full: clam.dev.bitmask.net
+    domain_internal: clam.dev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z"
+    ip_address: "176.53.69.22"
+    port: 4422
+  snail: 
+    domain_full: snail.dev.bitmask.net
+    domain_internal: snail.dev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD"
+    ip_address: "176.53.69.14"
+    port: 4422
 ip_address: "176.53.69.14"
 location: 
   country_code: TR
@@ -34,8 +68,37 @@ location:
   name: Istanbul
   timezone: "+2"
 mail: 
-  smarthost: 
-    - starfish.dev.bitmask.net
+  smarthost: []
+mx: 
+  aliases: {}
+  dkim: 
+    bit_size: 2048
+    private_key: /srv/leap/files/mx/dkim.key
+    public_key: /srv/leap/files/mx/dkim.pub
+    selector: babcfe98e4
+  key_lookup_domain: dev.bitmask.net
+mynetworks: 
+  - "1.209.122.123"
+  - "176.53.69.13"
+  - "176.53.69.14"
+  - "176.53.69.22"
+  - "198.252.153.82"
+  - "198.252.153.83"
+  - "198.252.153.85"
+  - "199.119.112.150"
+  - "199.119.112.151"
+  - "199.119.112.152"
+  - "199.119.112.153"
+  - "199.119.112.167"
+  - "199.119.112.205"
+  - "199.119.112.206"
+  - "199.119.112.207"
+  - "199.119.112.208"
+  - "204.13.164.171"
+  - "204.13.164.57"
+  - "37.218.240.50"
+  - "46.165.242.166"
+  - "85.17.92.143"
 name: snail
 obfsproxy: 
   gateway_address: "176.53.69.19"
@@ -69,8 +132,11 @@ openvpn:
 platform: 
   major_version: "0.8"
   version: "0.8"
+rbls: 
+  - zen.spamhaus.org
 service_type: user_service
 services: 
+  - mx
   - openvpn
 sources: 
   apt: 
@@ -141,7 +207,13 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  clients: {}
+  clients: 
+    couch_client: 
+      clam_5984: 
+        accept_port: 4000
+        connect: clam.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
   servers: {}
 tags: 
   - development
@@ -248,9 +320,211 @@ x509:
       xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF
       gkVBxxt/s0R2aKM=
       -----END CERTIFICATE-----
-  commercial_ca_cert: ~
-  commercial_cert: ~
-  commercial_key: ~
+  client_ca_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      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
+      -----END RSA PRIVATE KEY-----
+  commercial_ca_cert: |
+      -----BEGIN CERTIFICATE-----
+      MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB
+      hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+      A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+      BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQwMjEy
+      MDAwMDAwWhcNMjkwMjExMjM1OTU5WjCBkDELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+      EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+      Q09NT0RPIENBIExpbWl0ZWQxNjA0BgNVBAMTLUNPTU9ETyBSU0EgRG9tYWluIFZh
+      bGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+      ADCCAQoCggEBAI7CAhnhoFmk6zg1jSz9AdDTScBkxwtiBUUWOqigwAwCfx3M28Sh
+      bXcDow+G+eMGnD4LgYqbSRutA776S9uMIO3Vzl5ljj4Nr0zCsLdFXlIvNN5IJGS0
+      Qa4Al/e+Z96e0HqnU4A7fK31llVvl0cKfIWLIpeNs4TgllfQcBhglo/uLQeTnaG6
+      ytHNe+nEKpooIZFNb5JPJaXyejXdJtxGpdCsWTWM/06RQ1A/WZMebFEh7lgUq/51
+      UHg+TLAchhP6a5i84DuUHoVS3AOTJBhuyydRReZw3iVDpA3hSqXttn7IzW3uLh0n
+      c13cRTCAquOyQQuvvUSH2rnlG51/ruWFgqUCAwEAAaOCAWUwggFhMB8GA1UdIwQY
+      MBaAFLuvfgI9+qbxPISOre44mOzZMjLUMB0GA1UdDgQWBBSQr2o6lFoL2JDqElZz
+      30O0Oija5zAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV
+      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgG
+      BmeBDAECATBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9kb2NhLmNv
+      bS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggrBgEFBQcB
+      AQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E
+      T1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v
+      ZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAE4rdk+SHGI2ibp3wScF9BzWRJ2p
+      mj6q1WZmAT7qSeaiNbz69t2Vjpk1mA42GHWx3d1Qcnyu3HeIzg/3kCDKo2cuH1Z/
+      e+FE6kKVxF0NAVBGFfKBiVlsit2M8RKhjTpCipj4SzR7JzsItG8kO3KdY3RYPBps
+      P0/HEZrIqPW1N+8QRcZs2eBelSaz662jue5/DJpmNXMyYE7l3YphLG5SEXdoltMY
+      dVEVABt0iN3hxzgEQyjpFv3ZBdRdRydg1vs4O2xyopT4Qhrf7W8GjEXCBgCq5Ojc
+      2bXhc3js9iPc0d1sjhqPpepUfJa3w/5Vjo1JXvxku88+vZbrac2/4EjxYoIQ5QxG
+      V/Iz2tDIY+3GH5QFlkoakdH368+PUq4NCNk+qKBR6cGHdNXJ93SrLlP7u3r7l+L4
+      HyaPs9Kg4DdbKDsx5Q5XLVq4rXmsXiBmGqW5prU5wfWYQ//u+aen/e7KJD2AFsQX
+      j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII
+      0fxQ8ANAe4hZ7Q7drNJ3gjTcBpUC2JD5Leo31Rpg0Gcg19hCC0Wvgmje3WYkN5Ap
+      lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf
+      +AZxAeKCINT+b72x
+      -----END CERTIFICATE-----
+      -----BEGIN CERTIFICATE-----
+      MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
+      MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
+      ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
+      eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
+      gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+      BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD
+      VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq
+      hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw
+      AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6
+      2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr
+      ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt
+      4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq
+      m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/
+      vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT
+      8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE
+      IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO
+      KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO
+      GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/
+      s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g
+      JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD
+      AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9
+      MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy
+      bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
+      Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ
+      zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj
+      Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY
+      Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5
+      B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx
+      PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
+      pu/xO28QOG8=
+      -----END CERTIFICATE-----
+  commercial_cert: |
+      -----BEGIN CERTIFICATE-----
+      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
+      oleSsg==
+      -----END CERTIFICATE-----
+  commercial_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      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
+      -----END RSA PRIVATE KEY-----
   dh: |
       -----BEGIN DH PARAMETERS-----
       MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
@@ -316,4 +590,4 @@ x509:
       DLAqcy92Vg4/GCLdPfiMbjYKf8hYS0ZPSLZwRMJ7hhW+47iZS7q1fXulhA==
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: false
+  use_commercial: true
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
deleted file mode 100644
index cc857f2..0000000
--- a/hiera/starfish.yaml
+++ /dev/null
@@ -1,549 +0,0 @@
---- 
-clamav: 
-  whitelisted_addresses: []
-contacts: 
-  - micah@leap.se
-  - sysdev@leap.se
-couchdb_leap_mx_user: 
-  password: TISmwrYwSBmwbdDyQvJYu3_VkZmfZITc
-  salt: 79fd6d71c94a1aaf44cefc84a5a748dc
-  username: leap_mx
-development: 
-  site_config: true
-dns: 
-  public: true
-domain: 
-  full: starfish.dev.bitmask.net
-  full_suffix: dev.bitmask.net
-  internal: starfish.dev.bitmask.i
-  internal_suffix: dev.bitmask.i
-  name: starfish.dev.bitmask.net
-enabled: true
-environment: development
-firewall: 
-  mx: 
-    from: "*"
-    port: 
-      - 25
-      - 465
-    to: "176.53.69.23"
-  ssh: 
-    from: sysadmin
-    port: 4422
-    to: "176.53.69.23"
-  stunnel: []
-haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      clam: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
-hosts: 
-  clam: 
-    domain_full: clam.dev.bitmask.net
-    domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z"
-    ip_address: "176.53.69.22"
-    port: 4422
-  starfish: 
-    domain_full: starfish.dev.bitmask.net
-    domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh"
-    ip_address: "176.53.69.23"
-    port: 4422
-ip_address: "176.53.69.23"
-location: 
-  country_code: TR
-  hemisphere: "N"
-  name: Istanbul
-  timezone: "+2"
-mail: 
-  smarthost: []
-mx: 
-  aliases: {}
-  dkim: 
-    bit_size: 2048
-    private_key: /srv/leap/files/mx/dkim.key
-    public_key: /srv/leap/files/mx/dkim.pub
-    selector: !binary |
-        YmFiY2ZlOThlNA==
-
-  key_lookup_domain: dev.bitmask.net
-mynetworks: 
-  - "1.209.122.123"
-  - "176.53.69.13"
-  - "176.53.69.14"
-  - "176.53.69.22"
-  - "176.53.69.23"
-  - "198.252.153.82"
-  - "198.252.153.83"
-  - "198.252.153.85"
-  - "199.119.112.149"
-  - "199.119.112.150"
-  - "199.119.112.151"
-  - "199.119.112.152"
-  - "199.119.112.153"
-  - "199.119.112.167"
-  - "199.119.112.205"
-  - "199.119.112.206"
-  - "199.119.112.207"
-  - "199.119.112.208"
-  - "204.13.164.171"
-  - "204.13.164.57"
-  - "37.218.240.101"
-  - "46.165.242.166"
-  - "85.17.92.143"
-name: starfish
-platform: 
-  major_version: "0.8"
-  version: "0.8"
-rbls: 
-  - zen.spamhaus.org
-service_type: user_service
-services: 
-  - mx
-sources: 
-  apt: 
-    backports: "http://httpredir.debian.org/debian/"
-    basic: "http://httpredir.debian.org/debian/"
-    security: "http://security.debian.org/"
-  leap-mx: 
-    package: leap-mx
-    revision: latest
-    type: apt
-  nickserver: 
-    revision: origin/master
-    source: "https://leap.se/git/nickserver"
-    type: git
-  platform: 
-    apt: 
-      basic: "http://deb.leap.se/0.8"
-  soledad: 
-    package: soledad-server
-    revision: latest
-    type: apt
-  webapp: 
-    revision: origin/version/0.8
-    source: "https://leap.se/git/leap_web"
-    type: git
-ssh: 
-  authorized_keys: 
-    azul: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w==
-      type: ssh-rsa
-    chiiph: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDAotYxNrKKXihZrDd39iKrXZSm3r8L9SNzhe9JG6cPaLTYuxhrS9QejYih9noboWfsVFmNPFYH42u3/vMyJEtf1WEUqQ84Qh2oQaC3orGMdpo3fXlCwlcp9q55gZTbSkpKwjn4pmg++wdTNjMmldi1ifPDl2uVt7dUkjQk8hy7CTJofkTxrXIzGZx+OI0knuos+lNV1uU3nJ6upbBwkvxwy3S9nfZ9kq7y5PBo0wK9YkOrKIAZtCnb0nobOiFMPeQDJdBWIo0btv5tCtzqe/b28TYz6DrMWrLIEJ+t8PH6QxaB0oLtlx5fImRxykLVHEe9AO1WcV0aXW4+6ZsHRG4X
-      type: ssh-rsa
-    db: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCZoVRqaxZL4Btmt7Nfcj0jNbM5UhBSFl37MWApS9qUlx1zJeH7Vw1ZRzUT8zLtdpOyL4JrF1jJ+D25/dqdTEv5dc7I/IcUz16uVD3REi9wk9uRo05DmG1PXQ0Pp3kRGhNFTh5e1ZeGbPlxZkHyUirWGz8A6hrPTUA/k+KRsQg4nH+3UTPzZcy3jvw6YvdATFNkZ5dhKyae9T41McBEdh5yPArfuVTL/ssckTxyISF5ObsvbzuuarTeNQQO5VpFvK9luKzXpta9IRHMeAHpu88MCiMcWiZUZlaVlD9tC6OcMNxCBWWMlNwtowgBmoIZnjo7NrMsJ1ksUT4eDsvf6huu9nX3KIigSUeuWPtaPMHCghhLXLQSuIOhQWXjFzl+KzgiOZ4ahmNMqiCaRFHAHw6BRuZRxphiMq2gjvKRg6a4giDIf9gkEQ6v+tiUQoGYXuwfb0sGVJfrnZVifUz+I1j0wWCBWaY7+/LtfaNIl1byyPzG+qRhHMUlj/IALnT4DuHM+VkXNyQ0fucGcyhFxabqfdxRUT0EQok8ib06f16JBCoqdd6bn64v1M29QGFeSF0t4zjqqDik7VQvOMph2WAZv9FwhvPrmbSSs3MIe7wVBaFC8zeavrZ8oCO1U40q2UcntO6Z0NpIhnGZC7zVxguEux1moAtWIE0+JIsrbu41gQ==
-      type: ssh-rsa
-    elijah: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
-      type: ssh-rsa
-    ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQD5Z5UfdPaAO0DywH/Hfl1Zm29YJ2SDGfofIRtLdbw06Ov3kG0mnURVC/G1L8IrphLMoRMFJR0f6AXr+XyFOW2xLTvBDfYeuZa26yyjzKAUVp+J+rdmmnJkJQzuF5/WimVsZ+d06omXyD/d9TP2qB2gd9+z/zYOIm7G5H8/9gnC045Hny3Kyd7xOzt24qbCq6pufskRYHp5V/ncgWp/osXE7vGGIxOLDLaaKikAHY4h6Uezh2KphA5a52RKy9jEzKKNW10ltmfg3s2WVjtYsGaEHTsZXs1YDE03uk7cqDsDy98udY9GLiUpz15LBemWVK4lCPG6BWzph0s8zMsEixSw2qAm6butsZE/E6EYNLeTL3eC3tWR/yxQxhdAkRIUAxR2yX/l+vTyMO8Z5ThZx2WWVAXo3zGtxKJUE0LhwD713zBNoT3GTbQKjCyWalAoCQ9QlZCdDhMVw9mVL5hUUY17IiSgvR0HTh66ySJYuM4NN67K+eZhz/aRAbCyG8Uj/M9TQ3td7ExzegUtYYPevWYy0cZf52zqvfz9GXEWJbF5MhJl2/0CZxsmdYPI43/BR9H62tKiC3cjOXYzFQYnRDri+2VHSCcR8gV6veKv/YwezEhc7LY/qc24yGQuXDWiSDjwsvYKrvPo3Uc6T2cTOyMzbW5tro2rD4LE1KYHU51Q6w==
-      type: ssh-rsa
-    jessie: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw==
-      type: ssh-rsa
-    kali: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
-      type: ssh-rsa
-    kwadronaut: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
-      type: ssh-rsa
-    meskio: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
-      type: ssh-rsa
-    micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
-      type: ssh-rsa
-    monitor: 
-      key: AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFqCXlaYmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp76JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A==
-      type: ecdsa-sha2-nistp521
-    varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
-  config: 
-    AllowTcpForwarding: "no"
-  mosh: 
-    enabled: true
-    ports: "60000:61000"
-  port: 4422
-stunnel: 
-  clients: 
-    couch_client: 
-      clam_5984: 
-        accept_port: 4000
-        connect: clam.dev.bitmask.i
-        connect_port: 15984
-        original_port: 5984
-  servers: {}
-tags: 
-  - development
-  - istanbul
-x509: 
-  ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
-      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
-      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
-      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
-      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
-      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
-      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
-      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
-      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
-      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
-      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
-      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
-      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
-      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
-      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
-      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
-      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
-      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
-      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
-      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
-      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
-      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
-      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
-      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
-      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
-      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
-      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
-      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
-      yV8e
-      -----END CERTIFICATE-----
-  cert: |
-      -----BEGIN CERTIFICATE-----
-      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
-      paXtHuVV60HByQUM49ceQgpITgrtgCg38dM=
-      -----END CERTIFICATE-----
-  client_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFpzCCA4+gAwIBAgIBATANBgkqhkiG9w0BAQ0FADBmMRAwDgYDVQQKDAdCaXRt
-      YXNrMRwwGgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MTQwMgYDVQQDDCtCaXRt
-      YXNrIFJvb3QgQ0EgKGNsaWVudCBjZXJ0aWZpY2F0ZXMgb25seSEpMB4XDTEzMDEy
-      MTAwMDAwMFoXDTIzMDEyMTAwMDAwMFowZjEQMA4GA1UECgwHQml0bWFzazEcMBoG
-      A1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5ldDE0MDIGA1UEAwwrQml0bWFzayBSb290
-      IENBIChjbGllbnQgY2VydGlmaWNhdGVzIG9ubHkhKTCCAiIwDQYJKoZIhvcNAQEB
-      BQADggIPADCCAgoCggIBAKaIdsRLSww0spDI9YzyBw4HKBJ+TdArzKcaspjdK9Tt
-      Utn6CgMnsVzSToNXNOjjqvlUbqqIcuLil7b1ALW65phadZ0BA31fZz1bPDO/hIua
-      UTSz8OhS93oRmgs22NOe/181YQgF1whhrPO4B7NzvZn6bNQnt96LAvBv74vfBacB
-      Vcp+yuvkBFT9Dh3v0ndLwu8WAL+Q54onoQvGge29MQkIs3l8xgOySUtl7lv04K0H
-      CV6tXRm3rrm9nI1RVaXUU5gfKuYT1V7NQIfrWjFrubpqhmwSp75mqLJya56k8C3o
-      mEoeL6pTXxMKIM/rpwnEweGNlHsEF7b1TF8jIxCSav1IMMR4APLLt6DLnwcKb+ix
-      IUeWU8QU9J7LyjyRPNKftsk2rp+ubsogjZ4sWBsEinB8jWjfVASmN+I2JV0a76ow
-      hmmHsm+2+2NPD3iQDi30yKpxNyhH3C0aoL7QqndC2/wNygYrM2wsiA2+Zic22s9b
-      //OVDdxQk5On3PwKiQZ2ZDrHapXjJeHQ1e3GeWn8EYwzwE0R7kDL6sDra8hH/1xY
-      sp8ZdEH9fDqjgtiKNEeevPzeGp321A8c7whkGdN926ihA9fsQ1jzEgQOJVBJd5Xa
-      GUWFPMDE6Xok3I1mXzvjJIgB8lqPf/gb4YvBV+lmEx8BxZIxQYonVQHFdZbD3sHt
-      AgMBAAGjYDBeMB0GA1UdDgQWBBSHfhO27FhbFFmofb2bj72ezvmibDAOBgNVHQ8B
-      Af8EBAMCAgQwDAYDVR0TBAUwAwEB/zAfBgNVHSMEGDAWgBSHfhO27FhbFFmofb2b
-      j72ezvmibDANBgkqhkiG9w0BAQ0FAAOCAgEAV8gHJY9Dh65P8hwlOUQHv5XMWIzI
-      idrtmeM0+OojShAJWSOqRxlHYcPn9i4hgMPRSkoZrmmEJLZESqD5EM0NcYwvYgQC
-      hn99fkTUnehHFZcLUALcmi/qk1rKI19+jB3XRIJWeppFJZjWyjwbdJ0z/4LoviF9
-      gSfMgNck2llR0BNdPXG3re+zH8uWNEu9PAGYQ+P3E4NOkufFV1Mg1w4wlQdYAUQl
-      AnwOn6NtKOlnPK/Hp+wTVxJ2UzzJydQPetRPO/OMNVNOSdkTDSqcYdT22rO5AHlF
-      YJFESKnwSIWHiK48CEhUNLKCyy88V0YkOWnKGI5KVsA83RtFQq1JJp5q6k4Bp2WC
-      Ivio1xK+D9VksRaCJuBV1MalPsxczDCaTaGsgzeFUgTvskcWKSEOjYp2B0+gccMu
-      menJXRdodW1Tt9WIYdxygm5Q36M9XAH8DV0/DRcB51sdMGQs0Wd7NmNXFr1aF9YB
-      Yh4cJPsT/9qSF0Y1QfzaTVSZ/AoFP4K1I5JixUMTz9DHT+TqQ/6lygQMM41PtnrM
-      6Kjuibkno2UVk/Y3FyjSxiYyGvHOC53Xi4qScSVZ5ejVkAP05WuH7IpsFzDtJK6K
-      xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF
-      gkVBxxt/s0R2aKM=
-      -----END CERTIFICATE-----
-  client_ca_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB
-      hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-      A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
-      BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQwMjEy
-      MDAwMDAwWhcNMjkwMjExMjM1OTU5WjCBkDELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
-      EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-      Q09NT0RPIENBIExpbWl0ZWQxNjA0BgNVBAMTLUNPTU9ETyBSU0EgRG9tYWluIFZh
-      bGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-      ADCCAQoCggEBAI7CAhnhoFmk6zg1jSz9AdDTScBkxwtiBUUWOqigwAwCfx3M28Sh
-      bXcDow+G+eMGnD4LgYqbSRutA776S9uMIO3Vzl5ljj4Nr0zCsLdFXlIvNN5IJGS0
-      Qa4Al/e+Z96e0HqnU4A7fK31llVvl0cKfIWLIpeNs4TgllfQcBhglo/uLQeTnaG6
-      ytHNe+nEKpooIZFNb5JPJaXyejXdJtxGpdCsWTWM/06RQ1A/WZMebFEh7lgUq/51
-      UHg+TLAchhP6a5i84DuUHoVS3AOTJBhuyydRReZw3iVDpA3hSqXttn7IzW3uLh0n
-      c13cRTCAquOyQQuvvUSH2rnlG51/ruWFgqUCAwEAAaOCAWUwggFhMB8GA1UdIwQY
-      MBaAFLuvfgI9+qbxPISOre44mOzZMjLUMB0GA1UdDgQWBBSQr2o6lFoL2JDqElZz
-      30O0Oija5zAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV
-      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgG
-      BmeBDAECATBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9kb2NhLmNv
-      bS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggrBgEFBQcB
-      AQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E
-      T1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v
-      ZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAE4rdk+SHGI2ibp3wScF9BzWRJ2p
-      mj6q1WZmAT7qSeaiNbz69t2Vjpk1mA42GHWx3d1Qcnyu3HeIzg/3kCDKo2cuH1Z/
-      e+FE6kKVxF0NAVBGFfKBiVlsit2M8RKhjTpCipj4SzR7JzsItG8kO3KdY3RYPBps
-      P0/HEZrIqPW1N+8QRcZs2eBelSaz662jue5/DJpmNXMyYE7l3YphLG5SEXdoltMY
-      dVEVABt0iN3hxzgEQyjpFv3ZBdRdRydg1vs4O2xyopT4Qhrf7W8GjEXCBgCq5Ojc
-      2bXhc3js9iPc0d1sjhqPpepUfJa3w/5Vjo1JXvxku88+vZbrac2/4EjxYoIQ5QxG
-      V/Iz2tDIY+3GH5QFlkoakdH368+PUq4NCNk+qKBR6cGHdNXJ93SrLlP7u3r7l+L4
-      HyaPs9Kg4DdbKDsx5Q5XLVq4rXmsXiBmGqW5prU5wfWYQ//u+aen/e7KJD2AFsQX
-      j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII
-      0fxQ8ANAe4hZ7Q7drNJ3gjTcBpUC2JD5Leo31Rpg0Gcg19hCC0Wvgmje3WYkN5Ap
-      lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf
-      +AZxAeKCINT+b72x
-      -----END CERTIFICATE-----
-      -----BEGIN CERTIFICATE-----
-      MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
-      MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-      ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-      eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
-      gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-      BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD
-      VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq
-      hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw
-      AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6
-      2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr
-      ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt
-      4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq
-      m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/
-      vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT
-      8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE
-      IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO
-      KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO
-      GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/
-      s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g
-      JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD
-      AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9
-      MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy
-      bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
-      Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ
-      zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj
-      Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY
-      Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5
-      B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx
-      PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
-      pu/xO28QOG8=
-      -----END CERTIFICATE-----
-  commercial_cert: |
-      -----BEGIN CERTIFICATE-----
-      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
-      oleSsg==
-      -----END CERTIFICATE-----
-  commercial_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  use: true
-  use_commercial: true
diff --git a/nodes/deer.json b/nodes/dotterel.json
index 7325b36..f0a657d 100644
--- a/nodes/deer.json
+++ b/nodes/dotterel.json
@@ -1,5 +1,5 @@
 {
-  "ip_address": "37.218.240.101",
+  "ip_address": "37.218.240.50",
   "services": "tor",
   "tags": [
     "development",
diff --git a/nodes/snail.json b/nodes/snail.json
index 2eee732..aa4573d 100644
--- a/nodes/snail.json
+++ b/nodes/snail.json
@@ -1,5 +1,5 @@
 {
-  "services": "openvpn",
+  "services": ["openvpn","mx"],
   "ip_address": "176.53.69.14",
   "tags": ["development", "istanbul"],
   "openvpn": {
diff --git a/nodes/snake.json b/nodes/snake.json
deleted file mode 100644
index 5c52b2e..0000000
--- a/nodes/snake.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "ip_address": "199.119.112.22",
-  "services": [
-    "couchdb",
-    "soledad"
-  ],
-  "tags": ["demo", "dc"],
-  // currently down in DC, 2013-06-27
-  "enabled": false
-}
diff --git a/nodes/starfish.json b/nodes/starfish.json
deleted file mode 100644
index 721a996..0000000
--- a/nodes/starfish.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ip_address": "176.53.69.23",
-  "services": "mx",
-  "ssh": {
-    "port": 4422
-  },
-  "tags": ["development", "istanbul"]
-}
diff --git a/nodes/wombat.json b/nodes/wombat.json
deleted file mode 100644
index 1fbaa78..0000000
--- a/nodes/wombat.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ip_address": "199.119.112.20",
-  "tags": ["demo", "dc"],
-  "services": [
-    "webapp"
-  ],
-  // currently down in DC, 2013-06-27
-  "enabled": false
-}
diff --git a/nodes/zebra.json b/nodes/zebra.json
deleted file mode 100644
index 3873f3d..0000000
--- a/nodes/zebra.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ip_address": "199.119.112.21",
-  "services": "mx",
-  "tags": ["demo", "dc"],
-  // currently down in DC, 2013-06-27
-  "enabled": false
-}
diff --git a/secrets.json b/secrets.json
index f46ba32..4d5b12c 100644
--- a/secrets.json
+++ b/secrets.json
@@ -1,6 +1,5 @@
 {
   "clientdev": {
-    "bigcouch_cookie": "K9m8WdVuxp8gxPVnSpW7uPsbYFFLHpqs",
     "couch_admin_password": "abVQmkZubeAvncgcVSYRD4_pHANEItWb",
     "couch_admin_password_salt": "a5a58ff4365be3113f19014ea3050129",
     "couch_leap_mx_password": "HJXaTzM5gChwwr5Ur3epyacegvXNIDYK",
@@ -58,29 +57,9 @@
   },
   "disabled": {
     "scramblesuit_password_hippo": "GZ5FI5KQJUZVSTTYOI3XESDNOVEXQR2K",
-    "scramblesuit_password_seahorse": "MI2HSV2TJBHFO4TUKJIUUVCMMNTWOTDV",
-    "scramblesuit_port_hippo": 28975,
-    "scramblesuit_port_seahorse": 20889
-  },
-  "local": {
-    "couch_admin_password": "_Bn6AqU54shspQxbnsQTpRySjLQKTjBh",
-    "couch_admin_password_salt": "3195fb6efdbf4b4825026116d5aaabfe",
-    "couch_leap_mx_password": "Fc3qYjjVuwWAEyGDYPGYqUYUqeqJIfba",
-    "couch_leap_mx_password_salt": "071d214afa9e7cfb9cba66575817f6fe",
-    "couch_nickserver_password": "bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR",
-    "couch_nickserver_password_salt": "73567fc12c27a79152620084e97b4fba",
-    "couch_replication_password": "4DnBJUEXhTgg_BSkIh6KAjyg5cTPp9cG",
-    "couch_replication_password_salt": "bba73d9c1682814cb44fab45c4d0edb0",
-    "couch_soledad_password": "E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp",
-    "couch_soledad_password_salt": "e2b6fa1a29b1afbe1ea4a3f7ec5bacc7",
-    "couch_webapp_password": "pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9",
-    "couch_webapp_password_salt": "7e8868f8c4775290fd37d2f520d13672",
-    "nagios_admin_password": "kYNbjQCSCKgxCZmUJHcUCAMsc7ItrCuS",
-    "nagios_test_password": "uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT",
-    "webapp_secret_token": "btsFN6UD9nfP4SAWDYMmuMkgRTL5WW7E"
+    "scramblesuit_port_hippo": 28975
   },
   "mail": {
-    "bigcouch_cookie": "qYZj2DWkSeCRdInmdMP5Eg5xtcc8wuAp",
     "couch_admin_password": "5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw",
     "couch_admin_password_salt": "402b758e70fc5ab21509fcb46df37f09",
     "couch_leap_mx_password": "kh8Md4qQZupTX4qAYZDHP8LAXWFIkwkq",