demo: decommission wallaby, require tcp for vpn.

13 files changed, 637 insertions, 852 deletions

diff --git a/files/nodes/leech/leech.crt b/files/nodes/leech/leech.crt
index 4dcb476..1d104ff 100644
--- a/files/nodes/leech/leech.crt
+++ b/files/nodes/leech/leech.crt
@@ -1,33 +1,34 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
-QAIJxkTrBiIoi5gJzZz46opd43g=
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE2MDcyMTAwMDAwMFoXDTE3
+MDcyMTAwMDAwMFowITEfMB0GA1UEAwwWbGVlY2guZGVtby5iaXRtYXNrLm5ldDCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALzb/JZGbi4esdTNwzYlVr/M
+UPDNKhs8GAlWzo50ZC2hQA0nkSN9gwDRs7BtU5LjmMIthJtmZaeT88rhaDkh3zg9
+GvZT2tj0GpMvqzdtcR1yOjb/6/dG3idzsK+UXTBXsAHo3ZyxizH73oXrxIDX9dbU
+VxReT3gVtQTRD0IU/PSwwbRUpYm/RyMzSHYn58uJbOWLd/hh/wGSZnryh8+2qf6y
+H1u9pzHD6b70ZIQb8wgHWZOmXxfsRWnZgTwv8fXTPrcBRg1QN08zY3/v4oSkd6fF
+0JTQkJiOJ+Cb8vzwbhqY01QCIhuWcxqVa8Bf2muhhYWzwtsUZ8+wWoapUgAoYUsz
+Bt3Itx/EyYgF+bt7cXC3CGeV7I0kdmd3vMU0db10hxsT9Tbc1BcEyqXc7laIaGFU
+aYxTbwtMOv0ivvPZdhM9ywO5XV1Nki1M73LX+5fSdicrqeZY/p1Ms8xlI8/NUc0n
+t5TGwL0pN8DM3cPPOiZk1IYFKmSxQI7SHUVcEnb3lx9CsoEvqYAfX65J5FSCrc2A
+dH/poM2dzkd8eWyxdTUTFn2zwa3m0X3+6tY3EBkvngjcy1sCuIcZAETrDXq1iyJS
+S6ACEGnNe4BUtW6rldzvGHLXwI7AnMMS6WKaPsHuU/IM0ujnDUXlxFgR+qtG7/8p
+tOXxVk2Ft2ACBRmEPbb5AgMBAAGjgfswgfgwHQYDVR0OBBYEFH3W6Z0ZL64UApQ4
+vcRCSLtg4JxUMH8GA1UdEQR4MHaCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1v
+LmJpdG1hc2submV0ghRsZWVjaC5kZW1vLmJpdG1hc2suaYIWbGVlY2guZGVtby5i
+aXRtYXNrLm5ldIIYbmlja255bS5kZW1vLmJpdG1hc2submV0hwTG/JlVMAsGA1Ud
+DwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIw
+ADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsF
+AAOCAgEAmr75ICYJTUDDfEL89ma67trktP17hHDR5RWlQfzoedxCdXoyFV4Oxb+b
+aMxv9E4du2ZAP71cajE0fiPlLaZCsHvUlizMSDzOUUWiMBS1gtSodoKKmT+BEv5q
+/sCVlZUAD/FUgkFuvltQD3f5IcGzYak/skdEuPZWOHlvwVMR24OViBM6mdMvmnVb
+fbC2oWJvJwnFg/aWlj5f1aDWKmoPfUKo91hmPaG6gnZXzAZvr/+BxC2WliL132mq
+eI1CcrelX4fcRUl5++rlthONeqzbMqn0iqFXrZIkxvr6h7KN3AHAtHGkmgpuVY8K
+QDfkiez4qXOPFPjjtsBFz4GOcwzLN10JCkiorw/DdmaKXtJs8FHvHIiNUOGnm9JN
+c1sM8N2vCBvCO5/WGJ4uOZBtsJu9EPRTtbmL3FWe17ajpFJpF1kjqiRw+zEQvmVz
+x26m1O7M0EVwlldLgtxKhkcgcgTTqmSSdeieUFUGFEViG/Ok1bzQSYErM+K9B/Xb
+I5Ij2iiafdA9VuFk/T41efek14z50zliTtO9n7qiLkdgvnHhaeAjIxcBQsQoRD+S
+tqa14tW83CkdQTd8YftpY2MIgl9Ir7X3NiJ9QVCrclxVvy8lNMgeqMXlelKgbjWD
+NIVZjXODolGfIoqJUdcCOzwh59I0XoRJYgT8u4opgGkTYtZVZuI=
 -----END CERTIFICATE-----
diff --git a/files/nodes/leech/leech.key b/files/nodes/leech/leech.key
index e189e22..21c8890 100644
--- a/files/nodes/leech/leech.key
+++ b/files/nodes/leech/leech.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIJKgIBAAKCAgEA6eN3FHFffFVyXFTYsF5ARxUEEOSODqe6o2GPKRVHhGaDPrIG
-t89FJjp1Xj0CgV5ifRHQ1xaoHoZQqdr1l2NooduZqbFrkJlkANKONJQ5jxw1dRqt
-AJD3JqHkHtDEB1LA/o+X28BNxWDer3D3vr2N0UCKdJjsRvijRcXKmkjsh1inZ5y+
-OQb42Et40FAZtqLOTlNsrQEJW6Do8LqGVGPsckyMagahrcenFyI8aluCn27I1Gpc
-5P6idWol07dCg0dhJLOsOlz5pX1VL2jhi0LJ6V9b+sIRYpHGeACvZFon0Vt3K5f/
-ctDmoj8ojN5KSEJ/aXAPkNdQBOdsmdwR/akLJCSx2FZSE2vwUCMnT+aae8i43VtU
-+jcIqDBPlXnzfYESfdPJXWAruVYXMap8kINAl8u9h/w9A6t29r0pv92Tiv+d2bD4
-Q+E8avfAVd4TjBJqou4GcEs0qqx5J7Ymxb2dezh7T9SUT4jGEEYSSjlvc37fDBxH
-XqW0VXNmAIWb5PcClTJqH2FBGseJDbPvDUU6wK7gGq5rgkmwSZ1gR9zLXAgynEcS
-ktlqMsNuswq+kmv4l1w4Wz4zoZcVlTApkZKyHy+ILNkzRAR1NSU6pj3cfFAqpjQV
-Tebn9VW1rgvHg2GAx1QcpfZtLZ2KSqSZDr9g7l3TGEHVNq+XbQ+dbtaUisUCAwEA
-AQKCAgEAo6liszBeE5+rBYbtlgRt0A+Zp8R2zzR5OkhTJ/lW8QPWxPFIGCj2hziS
-1l20uhf0rPXhgBC/lZSBL0ojXkrWdaQ303FuBmH/gz/S+GHcIRMpKQeAlYvbFfJk
-sVd+RG2Y1MhgCAp5oSsWyAcxpQv5B7q057/2XfcwMOulyO5MbK0Rf0REK52AVcIC
-CSpzw8QKvu5LdofqJ27icUjkJHtDgfukqbB4RCUX++0d/4KHVc7sww6mcCrqPWUI
-kSyEY154UHlVhAV5P18DU8h9Qrh6l03+C+ruxV2iVmiMUplvkWUCb8PNoWcia9fs
-JR6LNiMqCvq6Oa0gtj3GVaeUAz7dppd+QsrbCtlonB6JKbvUOzR5pyaep+lu/XdL
-pOcI25+Sm1+8X2nPPU/2olaJwiWIHkOBYWn/375qS2vYujjoDxlt9K0GBiqjDYMi
-ho7ozSD9yg8o5liUiDuwb6uc0lexMrYKK1jIkC6/Tg2B+6nmZm++zblW2prx2785
-4/HZP6P0oYKyvE00xSUx6xBi6KdHbg7jVUzgT7w8n7Oczwh++iQBXIvFRifRel+j
-IpFwJZWstTqyBORFtsMjceoQ0/SiZJsduC3Xujt0EdD7NIkCyLSZxrcqQBKP1JOg
-BUWbfeqyc1oyJYbqq4SDsHJT532OsjVEsii41NuR9T2qiOqUO0ECggEBAPXSv+xh
-P4FcLfLK4JuCHM7iyPVe5d9ruiq62KGSAhrD3Pe6z9qpeLDEp15iEn8Ix08y7ONH
-BjB1UA6I5fXK8TEtG6GALNIFvUwuNVM3bh4mNiewV3st5Dk7/gyBvnsmdyJo+qag
-B3Tkl13t/z94kad2cJ0RQgeoll9sbTFhGr7EQYuh9hWbOxtchv2QFXW0D4uuH0Fx
-q1sd++FGLwFoyDhdZe2Wm9Gv99mKeZlrZhUjaRs/a1+GrjcFzlBnkhqi3sjpi+w2
-Lx1QdGtlyXU3NO0XR4eNnDp109Jc9k9fsIZDDm66YXmptJj2Abjtm+yKj6SWsauS
-VZCJcCtZTfD5rdUCggEBAPOSOw6ezuxXEMVvgg+pDErH4srNL5mp5ei5r53t+ARi
-4DHdPkeDbgG0ZZH3PdoAwzsGDF86ycfraAwxYgQKLpV6XxDpOHGSr30uc2YDs3pd
-zrYesIJ7p0hkDBfCR66ymXfOxITxs+ScydcnkCuHjrmv3Pt/qjP9fxZa4U9dydPq
-lWpBxEoHVta1/sUTMXmdF4m2Z7MJTJlIXbXHp1av/sIY96/qm2x1AKq/N83JXiJy
-UAZOa+bmixqPe8Wq3VjiyuVFCrDjyDkYlmI3e4hnA+C1d7u8i9OUF9Bj+OaK09fq
-5Z+liUAIRcKKBOfIT2gedLfYsq1macqM5cb/zZoysTECggEBAKBEzyxmGulUGAD7
-lITOx8l6wlp3jJelvLKvLx3n+8dHe4FoIqwFYdKd5CD8/+Ii7w8LvLZRUA+37IIN
-byBZN/c/2Yvp7U7gvxIz7kBbG0g80YH+zopY2TsXigLNdEsGQRYGK6UHINVtU+LB
-kHDpQs1TwwgkgFBN8fw0zNws2ysU+Ub4SWC83ERyhvA6SEN9KcV/uJEKcxXs7pNp
-FqxsjF1zR0knsF99wrHqPm1wQBX4CEbjijW1sU/eUSzK2c7T8Tw8SCWxDfamxcBf
-lID/hVoum0wdX4Yd3ASC53PIh2aBwZ8flP2lT0GK4oSXJdmKXSyJszyRI4ggkykw
-CEjcACECggEBALwJ4YP5AGCfGriBzJQQewfkZucQHzZvXqobaEPxam7gcpqsZh9J
-jQzN2zgj+uEpg482rSh7tzmbOFlpanUZ8zq9HVVt54BusQJgcQCJzO6kKyiYasZh
-dhTCAD/7YeGxyh8fRsIn4yyUCpMK3Rdt8LbT2TNkLN80Tf/RK25dRqpOyQkeOs63
-+ceK+2Pj3Gc56ukLI+WpQTR5FLd4qmyXNINeSSHLajAB6ADp3MgHNKA9RiCIPG8m
-/q8DpJdGwNmVRPRZJ9bGE1ZY8AhlMv5sISdCkWwjNIOkKfpco9Q/yyo/EwT8BAim
-Gk0ExqK2Fu+Xy53/MnoBvZx8yAuogm8PwZECggEANPQcOJ0Xt9TYhr1GnsJxyyIM
-8V3PmqHDfJg6D3zUixjTM0x2ek6Lv1qoyX2xazkZxkPEHv67VUlewXopRT2Ii8OO
-uOuRLXfMszgIcACHf9hvunJaNzwMdBWm/gfKcQAofCOi/J/dGiEf+Jan5QYRkPnX
-c1zRb/VXf50Q/PPEWDrz4K7OmvCyRYwajQ/burRlCpcyZMceSc5vuu0/ChXo/Yf/
-OnMcrsy9UI69YdMeBb74YZkSZJcPY1aScT1sAenSoUiCHEU/4GBWD0QyFAwALE4F
-LGZL2EVZsW1oa4i7yZer40B+cHHJnimLivvvWlVwiwKr/ftCqASdmJf13BBhwQ==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/files/nodes/wallaby/wallaby.crt b/files/nodes/wallaby/wallaby.crt
index fddd658..6bcbba8 100644
--- a/files/nodes/wallaby/wallaby.crt
+++ b/files/nodes/wallaby/wallaby.crt
@@ -1,34 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIF+TCCA+GgAwIBAgIQKv5Gnx9yruTOC1YH6QH95TANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTUxMDAyMDAwMDAwWhcNMTYx
-MDAyMDAwMDAwWjAjMSEwHwYDVQQDDBh3YWxsYWJ5LmRlbW8uYml0bWFzay5uZXQw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDwjvltcyx8ctpSmjkDtGLG
-sSdW5P96yDj5iZThZlg4K5sIRT9+KM3sfUp1FVLLGVCJO0YCrnOTnanZffK7eyZQ
-tZ/N/TIhu1vSa2kBSB75GuSocYXRbBHTir/M7/GUIQ1b5TZBl/6j3VNHtCJdJ6vF
-smSV4TvsphqJkmzrSqz50pMBUkZim8Tpo1qIFx9ttLRzE9wTgfifjAOfVIVdvyJ2
-2to4IpMXo41L6ZN/C5idRMMFMzCm3FF0cBubpM1ukVJBHjvPWIEk95of+FjFoVM5
-NxbTUuoFjIJSO8Rtdf/7B8TY+Sht44zqreKfB7ov5CUO57YRiXJh5kNg79DlwsfU
-1gQPc/Mu3AMsw/OG+gDsBPjDA5cu+kmznhJzpuwXqLTiXQIYh4DZbOkYw9SQwcIm
-TrRi4+jF1SEWtJTD4AHaM7EOxRdqzJ1DstxVZH+RmGUQxh1l3T8betp2ckSyViRS
-Od3rheHms3ANnXFB6X3vSYw+S/c7nvrC4JhnkhSzrfCWs2PBVfn1/PnvKqh5M6EV
-Luu6Mky2EeHMjk/9pkRGm0saAZPjH/j1BjhWnccU/dECzEsbSAEjI2cQeGUDn8XH
-EDwCKR1TtLFZw28CsIgZJRjschQxoiWVWNuETrDJQKKh7k0v8DfMOS9dOkSt7rJo
-GVj1f6z980OvYsbIkaIfmQIDAQABo4IBADCB/TAdBgNVHQ4EFgQUWwng+N2SkK2S
-FFFNir7r7bu2/pEwgYMGA1UdEQR8MHqCFGFwaS5kZW1vLmJpdG1hc2submV0ghBk
-ZW1vLmJpdG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCFndhbGxh
-YnkuZGVtby5iaXRtYXNrLmmCGHdhbGxhYnkuZGVtby5iaXRtYXNrLm5ldIcEzA2k
-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
+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
+IN0OoBaFkEN3p+0QBc7zLOCKYJ1kjXA2YXI=
 -----END CERTIFICATE-----
diff --git a/files/nodes/wallaby/wallaby.key b/files/nodes/wallaby/wallaby.key
index 698bb44..c1aa7e3 100644
--- a/files/nodes/wallaby/wallaby.key
+++ b/files/nodes/wallaby/wallaby.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 5a8048f..8546df2 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -21,4 +21,3 @@ mudskipper,mudskipper.cdev.bitmask.i,mudskipper.cdev.bitmask.net,1.209.122.111 s
 otter,otter.demo.bitmask.i,otter.demo.bitmask.net,46.165.242.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp
 snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD
 tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n
-wallaby,wallaby.demo.bitmask.i,wallaby.demo.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ=
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 2a6f2d0..2b60d6a 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -56,20 +56,14 @@ firewall:
   stunnel: []
 hosts: 
   leech: 
-    domain_full: leech.demo.bitmask.net
-    domain_internal: leech.demo.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
-    ip_address: "198.252.153.85"
-    port: 4422
-  wallaby: 
     aliases: 
       - api.demo.bitmask.net
       - demo.bitmask.net
       - nicknym.demo.bitmask.net
-    domain_full: wallaby.demo.bitmask.net
-    domain_internal: wallaby.demo.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ="
-    ip_address: "204.13.164.57"
+    domain_full: leech.demo.bitmask.net
+    domain_internal: leech.demo.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
+    ip_address: "198.252.153.85"
     port: 4422
 ip_address: "198.252.153.82"
 location: 
@@ -178,7 +172,7 @@ tags:
   - seattle
 testing: 
   api_hosts: 
-    - wallaby.demo.bitmask.net
+    - leech.demo.bitmask.net
   api_uri: "https://api.demo.bitmask.net:4430/1"
   monitor_auth_token: pvUz85Prt4jXF5aypSaBVeyeHBgHDcj5
 x509: 
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index c1d1e18..28bd068 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -1,4 +1,10 @@
 --- 
+api: 
+  ca_cert_uri: "https://demo.bitmask.net/ca.crt"
+  domain: api.demo.bitmask.net
+  port: 4430
+  uri: "https://api.demo.bitmask.net:4430/1"
+  version: 1
 clamav: 
   whitelisted_addresses: []
 contacts: 
@@ -8,9 +14,168 @@ couchdb_leap_mx_user:
   password: RcW_Xm2ERaZruapjSqQkhGeGIKgFLzML
   salt: 44cebadcb0fffe36a13d88091aaffeb9
   username: leap_mx
+definition_files: 
+  eip_service: |-
+      {
+        "gateways": [
+          {
+            "capabilities": {
+              "adblock": false,
+              "filter_dns": false,
+              "limited": false,
+              "ports": [
+                "443"
+              ],
+              "protocols": [
+                "tcp"
+              ],
+              "transport": [
+                "openvpn"
+              ],
+              "user_ips": false
+            },
+            "host": "millipede.demo.bitmask.net",
+            "ip_address": "198.252.153.84",
+            "location": "seattle__wa"
+          },
+          {
+            "capabilities": {
+              "adblock": false,
+              "filter_dns": false,
+              "limited": false,
+              "ports": [
+                "443"
+              ],
+              "protocols": [
+                "tcp"
+              ],
+              "transport": [
+                "openvpn"
+              ],
+              "user_ips": false
+            },
+            "host": "otter.demo.bitmask.net",
+            "ip_address": "46.165.242.169",
+            "location": "frankfurt"
+          }
+        ],
+        "locations": {
+          "frankfurt": {
+            "country_code": "DE",
+            "hemisphere": "N",
+            "name": "Frankfurt",
+            "timezone": "+1"
+          },
+          "seattle__wa": {
+            "country_code": "US",
+            "hemisphere": "N",
+            "name": "Seattle, WA",
+            "timezone": "-7"
+          }
+        },
+        "openvpn_configuration": {
+          "auth": "SHA1",
+          "cipher": "AES-128-CBC",
+          "keepalive": "10 30",
+          "tls-cipher": "DHE-RSA-AES128-SHA",
+          "tun-ipv6": true
+        },
+        "serial": 1,
+        "version": 1
+      }
+  provider: |-
+      {
+        "api_uri": "https://api.demo.bitmask.net:4430",
+        "api_version": "1",
+        "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e",
+        "ca_cert_uri": "https://demo.bitmask.net/ca.crt",
+        "default_language": "en",
+        "description": {
+          "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
+          "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
+          "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted."
+        },
+        "domain": "demo.bitmask.net",
+        "enrollment_policy": "open",
+        "languages": [
+          "de",
+          "en",
+          "es",
+          "pt"
+        ],
+        "name": {
+          "en": "Bitmask"
+        },
+        "service": {
+          "allow_anonymous": true,
+          "allow_free": true,
+          "allow_limited_bandwidth": false,
+          "allow_paid": false,
+          "allow_registration": true,
+          "allow_unlimited_bandwidth": true,
+          "bandwidth_limit": 102400,
+          "default_service_level": 1,
+          "levels": {
+            "1": {
+              "description": "Please donate.",
+              "name": "free"
+            }
+          }
+        },
+        "services": [
+          "openvpn"
+        ]
+      }
+  smtp_service: |
+      {
+        "hosts": {
+          "leech": {
+            "hostname": "leech.demo.bitmask.net",
+            "ip_address": "198.252.153.85",
+            "location": "seattle__wa",
+            "port": 465
+          }
+        },
+        "locations": {
+          "seattle__wa": {
+            "country_code": "US",
+            "hemisphere": "N",
+            "name": "Seattle, WA",
+            "timezone": "-7"
+          }
+        },
+        "serial": 1,
+        "version": 1
+      }
+  soledad_service: |-
+      {
+        "hosts": {
+          "ant": {
+            "hostname": "ant.demo.bitmask.net",
+            "ip_address": "198.252.153.82",
+            "location": "seattle__wa",
+            "port": 2323
+          }
+        },
+        "locations": {
+          "seattle__wa": {
+            "country_code": "US",
+            "hemisphere": "N",
+            "name": "Seattle, WA",
+            "timezone": "-7"
+          }
+        },
+        "serial": 1,
+        "version": 1
+      }
 development: 
   site_config: true
 dns: 
+  aliases: 
+    - api.demo.bitmask.net
+    - demo.bitmask.net
+    - leech.demo.bitmask.net
+    - nicknym.demo.bitmask.net
   public: true
 domain: 
   full: leech.demo.bitmask.net
@@ -32,6 +197,14 @@ firewall:
     port: 4422
     to: "198.252.153.85"
   stunnel: []
+  webapp: 
+    from: "*"
+    port: 
+      - 443
+      - 4430
+      - 6425
+      - 80
+    to: "198.252.153.85"
 haproxy: 
   couch: 
     listen_port: 4096
@@ -50,20 +223,14 @@ hosts:
     ip_address: "198.252.153.82"
     port: 4422
   leech: 
-    domain_full: leech.demo.bitmask.net
-    domain_internal: leech.demo.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
-    ip_address: "198.252.153.85"
-    port: 4422
-  wallaby: 
     aliases: 
       - api.demo.bitmask.net
       - demo.bitmask.net
       - nicknym.demo.bitmask.net
-    domain_full: wallaby.demo.bitmask.net
-    domain_internal: wallaby.demo.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ="
-    ip_address: "204.13.164.57"
+    domain_full: leech.demo.bitmask.net
+    domain_internal: leech.demo.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
+    ip_address: "198.252.153.85"
     port: 4422
 ip_address: "198.252.153.85"
 location: 
@@ -98,11 +265,17 @@ mynetworks:
   - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "204.13.164.57"
   - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
 name: leech
+nickserver: 
+  couchdb_nickserver_user: 
+    password: CyhRSafC4SUGQ9F762Qfv3TPQDqTjn2G
+    salt: e3ee9259723d0cbd8b3265dbe8b4e21e
+    username: nickserver
+  domain: nicknym.demo.bitmask.net
+  port: 6425
 platform: 
   major_version: "0.9"
   version: "0.9"
@@ -111,6 +284,7 @@ rbls:
 service_type: user_service
 services: 
   - mx
+  - webapp
 sources: 
   apt: 
     backports: "http://httpredir.debian.org/debian/"
@@ -196,9 +370,112 @@ tags:
   - seattle
 testing: 
   api_hosts: 
-    - wallaby.demo.bitmask.net
+    - leech.demo.bitmask.net
   api_uri: "https://api.demo.bitmask.net:4430/1"
   monitor_auth_token: pvUz85Prt4jXF5aypSaBVeyeHBgHDcj5
+webapp: 
+  admins: 
+    - azul
+    - elijah
+    - kwadronaut
+    - mcnair
+    - meanderingcode
+    - micah
+    - varac
+  allow_anonymous_certs: true
+  allow_limited_certs: false
+  allow_registration: true
+  allow_unlimited_certs: true
+  api_tokens: 
+    allowed_ips: 
+      - "198.252.153.82"
+      - "198.252.153.83"
+      - "198.252.153.85"
+      - "46.165.242.166"
+    monitor: pvUz85Prt4jXF5aypSaBVeyeHBgHDcj5
+  api_version: 1
+  client_certificates: 
+    bit_size: 2048
+    digest: SHA256
+    life_span: "2 months"
+    limited_prefix: LIMITED
+    unlimited_prefix: UNLIMITED
+  client_version: 
+    max: ~
+    min: "0.7"
+  couchdb_admin_user: 
+    password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
+    salt: e1dca99375c513be477295f141b9f032
+    username: admin
+  couchdb_webapp_user: 
+    password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg
+    salt: c632af58769857bcdf108b46da9eaa44
+    username: webapp
+  customization_dir: /srv/leap/files/webapp/
+  default_locale: en
+  default_service_level: 1
+  domain: demo.bitmask.net
+  engines: 
+    - support
+  forbidden_usernames: 
+    - admin
+    - administrator
+    - administrators
+    - admins
+    - arin-admin
+    - certmaster
+    - contact
+    - email
+    - help
+    - help-desk
+    - help-ticket
+    - help-tickets
+    - help_desk
+    - help_ticket
+    - help_tickets
+    - helpdesk
+    - helpticket
+    - helptickets
+    - info
+    - mail
+    - maildrop
+    - noreply
+    - owner
+    - owners
+    - postmaster
+    - reply
+    - robot
+    - ssladmin
+    - staff
+    - support
+    - tech-support
+    - tech_support
+    - techsupport
+    - ticket
+    - tickets
+    - vmail
+    - www-data
+  locales: 
+    - de
+    - en
+    - es
+    - pt
+  modules: 
+    - billing
+    - help
+    - user
+  nagios_test_user: 
+    password: CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv
+    username: nagios_test
+  secret_token: GgKvW3NhAKwgvQuMAzdHhLDBh3g3u5Xd
+  secure: true
+  service_levels: 
+    1: 
+      description: "Please donate."
+      name: free
+      services: 
+        - eip
+        - email
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -235,37 +512,38 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
-      QAIJxkTrBiIoi5gJzZz46opd43g=
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE2MDcyMTAwMDAwMFoXDTE3
+      MDcyMTAwMDAwMFowITEfMB0GA1UEAwwWbGVlY2guZGVtby5iaXRtYXNrLm5ldDCC
+      AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALzb/JZGbi4esdTNwzYlVr/M
+      UPDNKhs8GAlWzo50ZC2hQA0nkSN9gwDRs7BtU5LjmMIthJtmZaeT88rhaDkh3zg9
+      GvZT2tj0GpMvqzdtcR1yOjb/6/dG3idzsK+UXTBXsAHo3ZyxizH73oXrxIDX9dbU
+      VxReT3gVtQTRD0IU/PSwwbRUpYm/RyMzSHYn58uJbOWLd/hh/wGSZnryh8+2qf6y
+      H1u9pzHD6b70ZIQb8wgHWZOmXxfsRWnZgTwv8fXTPrcBRg1QN08zY3/v4oSkd6fF
+      0JTQkJiOJ+Cb8vzwbhqY01QCIhuWcxqVa8Bf2muhhYWzwtsUZ8+wWoapUgAoYUsz
+      Bt3Itx/EyYgF+bt7cXC3CGeV7I0kdmd3vMU0db10hxsT9Tbc1BcEyqXc7laIaGFU
+      aYxTbwtMOv0ivvPZdhM9ywO5XV1Nki1M73LX+5fSdicrqeZY/p1Ms8xlI8/NUc0n
+      t5TGwL0pN8DM3cPPOiZk1IYFKmSxQI7SHUVcEnb3lx9CsoEvqYAfX65J5FSCrc2A
+      dH/poM2dzkd8eWyxdTUTFn2zwa3m0X3+6tY3EBkvngjcy1sCuIcZAETrDXq1iyJS
+      S6ACEGnNe4BUtW6rldzvGHLXwI7AnMMS6WKaPsHuU/IM0ujnDUXlxFgR+qtG7/8p
+      tOXxVk2Ft2ACBRmEPbb5AgMBAAGjgfswgfgwHQYDVR0OBBYEFH3W6Z0ZL64UApQ4
+      vcRCSLtg4JxUMH8GA1UdEQR4MHaCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1v
+      LmJpdG1hc2submV0ghRsZWVjaC5kZW1vLmJpdG1hc2suaYIWbGVlY2guZGVtby5i
+      aXRtYXNrLm5ldIIYbmlja255bS5kZW1vLmJpdG1hc2submV0hwTG/JlVMAsGA1Ud
+      DwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIw
+      ADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsF
+      AAOCAgEAmr75ICYJTUDDfEL89ma67trktP17hHDR5RWlQfzoedxCdXoyFV4Oxb+b
+      aMxv9E4du2ZAP71cajE0fiPlLaZCsHvUlizMSDzOUUWiMBS1gtSodoKKmT+BEv5q
+      /sCVlZUAD/FUgkFuvltQD3f5IcGzYak/skdEuPZWOHlvwVMR24OViBM6mdMvmnVb
+      fbC2oWJvJwnFg/aWlj5f1aDWKmoPfUKo91hmPaG6gnZXzAZvr/+BxC2WliL132mq
+      eI1CcrelX4fcRUl5++rlthONeqzbMqn0iqFXrZIkxvr6h7KN3AHAtHGkmgpuVY8K
+      QDfkiez4qXOPFPjjtsBFz4GOcwzLN10JCkiorw/DdmaKXtJs8FHvHIiNUOGnm9JN
+      c1sM8N2vCBvCO5/WGJ4uOZBtsJu9EPRTtbmL3FWe17ajpFJpF1kjqiRw+zEQvmVz
+      x26m1O7M0EVwlldLgtxKhkcgcgTTqmSSdeieUFUGFEViG/Ok1bzQSYErM+K9B/Xb
+      I5Ij2iiafdA9VuFk/T41efek14z50zliTtO9n7qiLkdgvnHhaeAjIxcBQsQoRD+S
+      tqa14tW83CkdQTd8YftpY2MIgl9Ir7X3NiJ9QVCrclxVvy8lNMgeqMXlelKgbjWD
+      NIVZjXODolGfIoqJUdcCOzwh59I0XoRJYgT8u4opgGkTYtZVZuI=
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -444,55 +722,55 @@ x509:
       -----END PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index adfc9fd..7681c2b 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -60,7 +60,6 @@ openvpn:
     - "443"
   protocols: 
     - tcp
-    - udp
   rate_limit: ~
   second_gateway_address: ~
   unlimited_prefix: UNLIMITED
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 81f4079..1aa24b4 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -60,7 +60,6 @@ openvpn:
     - "443"
   protocols: 
     - tcp
-    - udp
   rate_limit: ~
   second_gateway_address: ~
   unlimited_prefix: UNLIMITED
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index f562a2d..9795612 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -1,184 +1,17 @@
 --- 
-api: 
-  ca_cert_uri: "https://demo.bitmask.net/ca.crt"
-  domain: api.demo.bitmask.net
-  port: 4430
-  uri: "https://api.demo.bitmask.net:4430/1"
-  version: 1
 contacts: 
   - elijah@leap.se
   - sysdev@leap.se
-definition_files: 
-  eip_service: |-
-      {
-        "gateways": [
-          {
-            "capabilities": {
-              "adblock": false,
-              "filter_dns": false,
-              "limited": false,
-              "ports": [
-                "443"
-              ],
-              "protocols": [
-                "tcp",
-                "udp"
-              ],
-              "transport": [
-                "openvpn"
-              ],
-              "user_ips": false
-            },
-            "host": "millipede.demo.bitmask.net",
-            "ip_address": "198.252.153.84",
-            "location": "seattle__wa"
-          },
-          {
-            "capabilities": {
-              "adblock": false,
-              "filter_dns": false,
-              "limited": false,
-              "ports": [
-                "443"
-              ],
-              "protocols": [
-                "tcp",
-                "udp"
-              ],
-              "transport": [
-                "openvpn"
-              ],
-              "user_ips": false
-            },
-            "host": "otter.demo.bitmask.net",
-            "ip_address": "46.165.242.169",
-            "location": "frankfurt"
-          }
-        ],
-        "locations": {
-          "frankfurt": {
-            "country_code": "DE",
-            "hemisphere": "N",
-            "name": "Frankfurt",
-            "timezone": "+1"
-          },
-          "seattle__wa": {
-            "country_code": "US",
-            "hemisphere": "N",
-            "name": "Seattle, WA",
-            "timezone": "-7"
-          }
-        },
-        "openvpn_configuration": {
-          "auth": "SHA1",
-          "cipher": "AES-128-CBC",
-          "keepalive": "10 30",
-          "tls-cipher": "DHE-RSA-AES128-SHA",
-          "tun-ipv6": true
-        },
-        "serial": 1,
-        "version": 1
-      }
-  provider: |-
-      {
-        "api_uri": "https://api.demo.bitmask.net:4430",
-        "api_version": "1",
-        "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e",
-        "ca_cert_uri": "https://demo.bitmask.net/ca.crt",
-        "default_language": "en",
-        "description": {
-          "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
-          "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
-          "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted."
-        },
-        "domain": "demo.bitmask.net",
-        "enrollment_policy": "open",
-        "languages": [
-          "de",
-          "en",
-          "es",
-          "pt"
-        ],
-        "name": {
-          "en": "Bitmask"
-        },
-        "service": {
-          "allow_anonymous": true,
-          "allow_free": true,
-          "allow_limited_bandwidth": false,
-          "allow_paid": false,
-          "allow_registration": true,
-          "allow_unlimited_bandwidth": true,
-          "bandwidth_limit": 102400,
-          "default_service_level": 1,
-          "levels": {
-            "1": {
-              "description": "Please donate.",
-              "name": "free"
-            }
-          }
-        },
-        "services": [
-          "openvpn"
-        ]
-      }
-  smtp_service: |
-      {
-        "hosts": {
-          "leech": {
-            "hostname": "leech.demo.bitmask.net",
-            "ip_address": "198.252.153.85",
-            "location": "seattle__wa",
-            "port": 465
-          }
-        },
-        "locations": {
-          "seattle__wa": {
-            "country_code": "US",
-            "hemisphere": "N",
-            "name": "Seattle, WA",
-            "timezone": "-7"
-          }
-        },
-        "serial": 1,
-        "version": 1
-      }
-  soledad_service: |-
-      {
-        "hosts": {
-          "ant": {
-            "hostname": "ant.demo.bitmask.net",
-            "ip_address": "198.252.153.82",
-            "location": "seattle__wa",
-            "port": 2323
-          }
-        },
-        "locations": {
-          "seattle__wa": {
-            "country_code": "US",
-            "hemisphere": "N",
-            "name": "Seattle, WA",
-            "timezone": "-7"
-          }
-        },
-        "serial": 1,
-        "version": 1
-      }
 development: 
   site_config: true
 dns: 
-  aliases: 
-    - api.demo.bitmask.net
-    - demo.bitmask.net
-    - nicknym.demo.bitmask.net
-    - wallaby.demo.bitmask.net
-  public: true
+  public: false
 domain: 
   full: wallaby.demo.bitmask.net
   full_suffix: demo.bitmask.net
   internal: wallaby.demo.bitmask.i
   internal_suffix: demo.bitmask.i
-  name: wallaby.demo.bitmask.net
+  name: wallaby.demo.bitmask.i
 enabled: true
 environment: demo
 firewall: 
@@ -187,37 +20,7 @@ firewall:
     port: 4422
     to: "204.13.164.57"
   stunnel: []
-  webapp: 
-    from: "*"
-    port: 
-      - 443
-      - 4430
-      - 6425
-      - 80
-    to: "204.13.164.57"
-haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      ant: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
-hosts: 
-  ant: 
-    domain_full: ant.demo.bitmask.net
-    domain_internal: ant.demo.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI="
-    ip_address: "198.252.153.82"
-    port: 4422
-  leech: 
-    domain_full: leech.demo.bitmask.net
-    domain_internal: leech.demo.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
-    ip_address: "198.252.153.85"
-    port: 4422
+hosts: {}
 ip_address: "204.13.164.57"
 location: 
   country_code: US
@@ -225,22 +28,13 @@ location:
   name: "Seattle, WA"
   timezone: "-7"
 mail: 
-  smarthost: 
-    - leech.demo.bitmask.net
+  smarthost: []
 name: wallaby
-nickserver: 
-  couchdb_nickserver_user: 
-    password: CyhRSafC4SUGQ9F762Qfv3TPQDqTjn2G
-    salt: e3ee9259723d0cbd8b3265dbe8b4e21e
-    username: nickserver
-  domain: nicknym.demo.bitmask.net
-  port: 6425
 platform: 
   major_version: "0.9"
   version: "0.9"
-service_type: public_service
-services: 
-  - webapp
+service_type: internal_service
+services: []
 sources: 
   apt: 
     backports: "http://httpredir.debian.org/debian/"
@@ -313,121 +107,11 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  clients: 
-    couch_client: 
-      ant_5984: 
-        accept_port: 4000
-        connect: ant.demo.bitmask.i
-        connect_port: 15984
-        original_port: 5984
+  clients: {}
   servers: {}
 tags: 
   - demo
   - seattle
-webapp: 
-  admins: 
-    - azul
-    - elijah
-    - kwadronaut
-    - mcnair
-    - meanderingcode
-    - micah
-    - varac
-  allow_anonymous_certs: true
-  allow_limited_certs: false
-  allow_registration: true
-  allow_unlimited_certs: true
-  api_tokens: 
-    allowed_ips: 
-      - "198.252.153.82"
-      - "198.252.153.83"
-      - "198.252.153.85"
-      - "204.13.164.57"
-      - "46.165.242.166"
-    monitor: pvUz85Prt4jXF5aypSaBVeyeHBgHDcj5
-  api_version: 1
-  client_certificates: 
-    bit_size: 2048
-    digest: SHA256
-    life_span: "2 months"
-    limited_prefix: LIMITED
-    unlimited_prefix: UNLIMITED
-  client_version: 
-    max: ~
-    min: "0.7"
-  couchdb_admin_user: 
-    password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
-    salt: e1dca99375c513be477295f141b9f032
-    username: admin
-  couchdb_webapp_user: 
-    password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg
-    salt: c632af58769857bcdf108b46da9eaa44
-    username: webapp
-  customization_dir: /srv/leap/files/webapp/
-  default_locale: en
-  default_service_level: 1
-  domain: demo.bitmask.net
-  engines: 
-    - support
-  forbidden_usernames: 
-    - admin
-    - administrator
-    - administrators
-    - admins
-    - arin-admin
-    - certmaster
-    - contact
-    - email
-    - help
-    - help-desk
-    - help-ticket
-    - help-tickets
-    - help_desk
-    - help_ticket
-    - help_tickets
-    - helpdesk
-    - helpticket
-    - helptickets
-    - info
-    - mail
-    - maildrop
-    - noreply
-    - owner
-    - owners
-    - postmaster
-    - reply
-    - robot
-    - ssladmin
-    - staff
-    - support
-    - tech-support
-    - tech_support
-    - techsupport
-    - ticket
-    - tickets
-    - vmail
-    - www-data
-  locales: 
-    - de
-    - en
-    - es
-    - pt
-  modules: 
-    - billing
-    - help
-    - user
-  nagios_test_user: 
-    password: CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv
-    username: nagios_test
-  secret_token: GgKvW3NhAKwgvQuMAzdHhLDBh3g3u5Xd
-  secure: true
-  service_levels: 
-    1: 
-      description: "Please donate."
-      name: free
-      services: 
-        - eip
-        - email
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -464,265 +148,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
-      -----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-----
-      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-----
-  commercial_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFZDCCBEygAwIBAgISA78eQ6wk8YCqT9w8r5h6QRfiMA0GCSqGSIb3DQEBCwUA
-      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA3MTMyMDQ4MDBaFw0x
-      NjEwMTEyMDQ4MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
-      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTogAswbQSKrLS8AZf73L+MKf1HPEu
-      zsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2DkllzldN4Felb4k7p
-      1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6XrZIu5EcpQoTyHG4R
-      V6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYCp+Lufqae4xVh7sQw
-      5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa3XvCqt+vl1x4wDTA
-      mgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3AB5SfcvjAgMBAAGj
-      ggJxMIICbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGcwIPWo3Xb+fQfuHyTJq1Vq
-      bR+/MB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
-      BGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0
-      Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
-      dC5vcmcvMHsGA1UdEQR0MHKCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
-      dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCGHdhbGxhYnkuZGVt
-      by5iaXRtYXNrLm5ldIIUd3d3LmRlbW8uYml0bWFzay5uZXQwgf4GA1UdIASB9jCB
-      8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYGCCsGAQUFBwIBFhpodHRw
-      Oi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENl
-      cnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFy
-      dGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmljYXRl
-      IFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0
-      b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEATurnMUYbPVctxKvtYIkRJ1MCOUJqg5OM
-      ZXIqqbqBD3KfS0ylfuUbY/5WeGt+wIH3YQL5nlYG2eVbO4WdZNlVow8oo8yGwNRK
-      vkYiturL9TI02WcQ5+zmBHlTxbEdrXGfpHpCnx76Gu78ywcoSsGKjBepv04+LTt0
-      1HcUR/e6fup0r4DIIoX9UwS0zVaIJFHxe7ZzvOo5A+vSgnYONo9Alw0aK5oldnmI
-      d05hhSwqgM074mbWJKWsEEdxlUrWxvQE7LqAGO+T/koctxrnuaaeyo8js6NOgO54
-      Xg75gRgGqJcSW7WQxZzoNvRzlLHQjVWAHeKpD/p96/5BNCGxxlLCrQ==
+      MIIFtjCCA56gAwIBAgIRAMUduqXBWD0S6iYaLwzMes0wDQYJKoZIhvcNAQELBQAw
+      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE2MDcyMTAwMDAwMFoXDTE3
+      MDcyMTAwMDAwMFowIzEhMB8GA1UEAwwYd2FsbGFieS5kZW1vLmJpdG1hc2submV0
+      MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA907PW402xs6MaAwO5Ci2
+      zrswZ6hI/3UlEPM3wIJVUQSUXK0tZ/b43b8HUUWqCfn+uRlVP+p+7RzxlhhjWMAR
+      Ko4U0RHDnm74WjVZYIa+axddjGWPn4PLWBKlViCrLiQHeC3b105BndERp3dLt6ed
+      j48Xr5OPJGKQRPK0oQ0/yvBbF6ZGhwwztNiwI1LzGWorR9EE1y1xrae9pv7wSk3l
+      pjNC9wDaX7pMqkWP14u5lw3n+jrHpM/zqbn3iTZrs0Qx5MVB1pjTEV7BOkOp1U/g
+      mwoWIqo6TKDtfBEzP35ES/cmsycOUIH2OArajZKI9sttha3U1DS10PncPrW2vvRH
+      ghZ1Lzs+5q2Cup37RxIbHvoj6FkOq1ew3wUL98UTnryl8NhIpRE9rTxacT9GANq9
+      8vXZbchmj76W4GGk6wpGym/B4FToy4pUNElxHkeehl0Yy5OYx++53s32O/Ne9ioI
+      37GWP46ggGsU8hE03HC+rBoUiR8uUtyrd3Mc1VIlUrevhzenG4KhXuXJUlKTqSB5
+      +4/ZAGfe8eO5ZzjuLPAEZ87nxZGSWNe48TFMolBLHi+uX9cqQ/M1fstMS8S09cxd
+      ac9ogzF0rbZ+n8aj9zpuiiJFF2Nk+OxYaUZCtMniA4uuOYZ+kLZGwPcEVyISYNtr
+      YvWlEGrIPoxhYk+bv76dIEsCAwEAAaOBvTCBujAdBgNVHQ4EFgQURhHYB4CLVHk6
+      p2apT8xvA/tYzywwQQYDVR0RBDowOIIWd2FsbGFieS5kZW1vLmJpdG1hc2suaYIY
+      d2FsbGFieS5kZW1vLmJpdG1hc2submV0hwTMDaQ5MAsGA1UdDwQEAwIFoDAdBgNV
+      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
+      gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAeZyMY1Eh
+      h87n9ryemJcGtsUSQtn3tD8/rGVFEk5rsva6FQBrQb5gqtJ2MzlkWyqahd1JN1fB
+      5TqYGdevvnyWCcGup8QrPi6MiCQ2aTgdP7EqdptaYiHzX4f2wHi9QBjpQ5hffP43
+      lbv+fWKB+OR40Y9G9lNZ3JIrSMPkhLra3tNYDeCkN3wEeZ1hisGAB3lpISTlp/1S
+      tME1hM1jrerrCbZn6qNspGTBRzwT8WI+OWBfW24Qd8ozaVQxFYXQpKj8cIUgx8EJ
+      4JE6APiS4yqBQ4ivdNBeveteSJ02MWtROrVspXhvfiDMGRtxOpzuVbagnvCK2vMh
+      YXDKD61dWy5M2NdG0cW/050PEf5YrqcPOe+AxWsgiPykigprYTATItnmvADqa0Cb
+      tubn2aahm9PhCMSjEFFtLUq6nehQ3eKBceo4aR1bVc2eYT6mk712Shgf1z04Lab7
+      DsR09nBZwKgTAQqJe1h4/BnOb10/OR0VyDAl3eq05bdI4js4IJSVd4jZ6bX/+LcD
+      TAphl3vG6YDs0edw6sAqc1/yP+MmG+QnVkX+YY8rj0B5CrCNzZ9x5kibwtkB0Rt9
+      ukrtbedUxTaVeNSz1vL3kmjZbcEqi9wNn6B7LGAla3aVolHMZo7Wr5RWwlXiQAbL
+      IN0OoBaFkEN3p+0QBc7zLOCKYJ1kjXA2YXI=
       -----END CERTIFICATE-----
-  commercial_key: |
-      -----BEGIN PRIVATE KEY-----
-      MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDTogAswbQSKrLS
-      8AZf73L+MKf1HPEuzsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2D
-      kllzldN4Felb4k7p1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6X
-      rZIu5EcpQoTyHG4RV6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYC
-      p+Lufqae4xVh7sQw5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa
-      3XvCqt+vl1x4wDTAmgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3
-      AB5SfcvjAgMBAAECggEBAL2q77ss8uRhLhkMErqCEC4tjymHAcRwfLOnG/ZgT6rx
-      GmTLvY/5s1TQk5GTEvEDnvs1SwT8Mv8F5tIHJHIJshdqk9TMcurxKlYV1eFhKyqV
-      M9msmGuYL19p5+GHmAH49Tz8+aur2dgc8AjB/0RVRE1/F0UhI6gZQtlViwcPf0V4
-      t3loVXNAIFuBYTtu1t1iH5DK0ML8wu2aOfwHTHFKsJ4INt0sm0thjL19iasNlsaB
-      ads7q3p1btMKXeSEYYOxVsYglJ+NSqPtpEw7E3Z6JgULl1alc2Z3ePMqkLPpSXmg
-      Mt7RtpTvC/g5M9E7ss+7i3M4pm2xjFjFyc/jexpD0UkCgYEA+VVLEdxaVhAga2XP
-      ceNkNNt7qLWFQX+nhXFR1TyZm6SE1PxSoCZa/7Km1KqSbty0Wgws2Fv1UzAqJp0n
-      yDIZwdq0u2nijAsBmEL7Epf5L/JPUSCL+Vs1hP+tiXCgv75otu8B0G/OZ6DE4Iz6
-      la1XrMn2v9offeB4Juq0XiEgatcCgYEA2UqlMDKzOOkK+0KANUoIoG/WTS4hTLFN
-      upUR+IJ9jJ2ocYMHNO49kIrbLWmL79L6wQKJbKOWk7w0xo3XD4tZW5193ui/RxH/
-      lVa/41N5dpftCBQ2H5j3zGY2tsI+tXqV/vQVDFBR4Xa+bQJvL4sf8nWywyQB2i8T
-      vqaGQXgEcdUCgYEA1s3Jr+iEFzMrivsaXgbGVNdmULGZzRT6MPewxaHAwJtbKNb9
-      JCYHLdUu73bIUyRnaFCm7ftDfli3Z67rEAlBsYYHQJL3bykoRZInFhzBvLHn7X+5
-      t6kBkcRoMElM5ARZ2IhOqtE4JIUYOFCcrgi5yQ3yO9TiXqLdQMHhhFrLv98CgYEA
-      szjtTPbUemFFLH7qTonU2bfE833T+3TWnsmru+Std1jmgVHIlPDYGKtfInLG+DV1
-      m9Li1JeNcCcxBIAjXW/bcURSeJRSiGUhAOU/eln0ekvPNvWsup0p7g50nINUw8zr
-      gRGDdtec4bFWWYVDfdxrqklH+8psOLDRwVOKst8yE00CgYEAuBjCMuz48InN+xeM
-      WXhlby6TgZBoRyTZrTACtJBYGTKUlmOwwMgXVwF3BCvDhOKaLcUXD+nQOA4zWo0R
-      zWmo1f6sQ5LWWdvujapWSDL9l7ZZdY8ZwAk4uidBk+2nx5D3ACnh6xmr4b28VqKz
-      wbakjQdJc37xZwm2AxiBA8tBv0E=
-      -----END PRIVATE KEY-----
+  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: true
+  use_commercial: false
diff --git a/nodes/leech.json b/nodes/leech.json
index a582a5a..332815f 100644
--- a/nodes/leech.json
+++ b/nodes/leech.json
@@ -1,6 +1,9 @@
 {
   "ip_address": "198.252.153.85",
-  "services": "mx",
+  "services": ["webapp", "mx"],
+  "webapp": {
+    "secure": true
+  },
   "tags": [
     "demo",
     "seattle"
diff --git a/nodes/wallaby.json b/nodes/wallaby.json
index 82856a1..358528c 100644
--- a/nodes/wallaby.json
+++ b/nodes/wallaby.json
@@ -1,8 +1,9 @@
 {
+  "enabled": false,
   "ip_address": "204.13.164.57",
-  "tags": ["demo", "seattle"],
-  "services": "webapp",
-  "webapp": {
-    "secure": true
-  }
+  "tags": ["demo", "seattle"]
+  //"services": "webapp",
+  //"webapp": {
+  //  "secure": true
+  //}
 }
diff --git a/services/openvpn.json b/services/openvpn.json
index 937c31e..8961a5b 100644
--- a/services/openvpn.json
+++ b/services/openvpn.json
@@ -1,5 +1,6 @@
 {
   "openvpn": {
-    "ports": ["443"]
+    "ports": ["443"],
+    "protocols": ["tcp"]
   }
 }