use couch.mode:plain for all couch nodes

author: varac <varacanero@zeromail.org> 2016-02-24 22:11:14 +0100
committer: varac <varacanero@zeromail.org> 2016-02-24 22:11:14 +0100
commit: d11a0478948d5938a978bd6a9789915c1f7b7115 (patch)
tree: 33303f0a0c47cba64fea108badf9f0e98c16b478 /hiera
parent: f9d04f1ec4e381e7c40309ff89760d6d85b6a345 (diff)
15 files changed, 482 insertions, 358 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 7aab05d..af17d80 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -2,10 +2,8 @@
 contacts: 
   - sysdev@leap.se
 couch: 
-  master: true
-  mode: master
+  mode: plain
   port: 5984
-  pwhash_alg: pbkdf2
   users: 
     admin: 
       password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index e372021..2694d66 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -3,10 +3,8 @@ contacts:
   - elijah@leap.se
   - sysdev@leap.se
 couch: 
-  master: true
-  mode: master
+  mode: plain
   port: 5984
-  pwhash_alg: pbkdf2
   users: 
     admin: 
       password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
diff --git a/hiera/antelope.yaml b/hiera/antelope.yaml
index 6eab9d7..500a5ff 100644
--- a/hiera/antelope.yaml
+++ b/hiera/antelope.yaml
@@ -13,7 +13,6 @@ couch:
     ednp_port: 9002
     epmd_port: 4369
     neighbors: []
-  master: false
   mode: multimaster
   port: 5984
   users: 
@@ -190,10 +189,13 @@ 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: babcfe98e4
   key_lookup_domain: bitmask.net
 mynetworks: 
-  - "1.209.122.24"
-  - "1.209.122.26"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -202,19 +204,17 @@ mynetworks:
   - "198.252.153.83"
   - "198.252.153.85"
   - "199.119.112.12"
-  - "199.119.112.123"
-  - "199.119.112.124"
-  - "199.119.112.133"
-  - "199.119.112.147"
   - "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.197"
+  - "199.119.112.205"
+  - "199.119.112.206"
+  - "199.119.112.207"
+  - "199.119.112.208"
   - "199.119.112.8"
-  - "204.13.164.162"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.101"
@@ -247,7 +247,6 @@ soledad:
     salt: efac408f3cda73ebcb02f80c9c3a0bfa
     username: soledad
   port: 2323
-  require_couchdb: true
 sources: 
   apt: 
     backports: "http://httpredir.debian.org/debian/"
@@ -261,12 +260,15 @@ sources:
     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.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -284,7 +286,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -293,19 +295,19 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
@@ -328,7 +330,8 @@ stunnel:
     epmd_server: 
       accept_port: 14369
       connect_port: 4369
-tags: []
+tags: 
+  - mail
 webapp: 
   admins: 
     - azul
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 4b4daf5..3d3eabd 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -64,6 +64,11 @@ 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: babcfe98e4
   key_lookup_domain: unstable.bitmask.net
 mynetworks: 
   - "176.53.69.13"
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index e34a577..6a00287 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -3,10 +3,8 @@ contacts:
   - micah@leap.se
   - sysdev@leap.se
 couch: 
-  master: true
-  mode: master
+  mode: plain
   port: 5984
-  pwhash_alg: pbkdf2
   users: 
     admin: 
       password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH
diff --git a/hiera/cowbird.yaml b/hiera/cowbird.yaml
index 08683c4..9a556ba 100644
--- a/hiera/cowbird.yaml
+++ b/hiera/cowbird.yaml
@@ -65,10 +65,13 @@ 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: babcfe98e4
   key_lookup_domain: bitmask.net
 mynetworks: 
-  - "1.209.122.24"
-  - "1.209.122.26"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -77,19 +80,17 @@ mynetworks:
   - "198.252.153.83"
   - "198.252.153.85"
   - "199.119.112.12"
-  - "199.119.112.123"
-  - "199.119.112.124"
-  - "199.119.112.133"
-  - "199.119.112.147"
   - "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.197"
+  - "199.119.112.205"
+  - "199.119.112.206"
+  - "199.119.112.207"
+  - "199.119.112.208"
   - "199.119.112.8"
-  - "204.13.164.162"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.101"
@@ -117,12 +118,15 @@ sources:
     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.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -140,7 +144,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -149,19 +153,19 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index 8a80383..351639c 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -54,12 +54,15 @@ sources:
     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.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -77,7 +80,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -86,19 +89,19 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index e236fa2..b495f7b 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -276,7 +276,7 @@ hosts:
   leech: 
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo="
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
     ip_address: "198.252.153.85"
     port: 4422
   millipede: 
diff --git a/hiera/goldeneye.yaml b/hiera/goldeneye.yaml
index 151793b..37df0ed 100644
--- a/hiera/goldeneye.yaml
+++ b/hiera/goldeneye.yaml
@@ -8,7 +8,6 @@ couch:
     ednp_port: 9002
     epmd_port: 4369
     neighbors: []
-  master: false
   mode: multimaster
   port: 5984
   users: 
@@ -102,7 +101,6 @@ soledad:
     salt: ac15331e0c098126e04ecf7a21045079
     username: soledad
   port: 2323
-  require_couchdb: true
 sources: 
   apt: 
     backports: "http://httpredir.debian.org/debian/"
@@ -116,12 +114,15 @@ sources:
     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.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -139,7 +140,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -148,19 +149,19 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index 552677f..8add43a 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -13,6 +13,18 @@ domain:
   name: hippo.bitmask.net
 enabled: true
 environment: disabled
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 4422
+    to: "85.17.92.143"
+  stunnel: []
+  vpn: 
+    from: "*"
+    port: 
+      - 28975
+      - "443"
+    to: "85.17.92.167"
 hosts: {}
 ip_address: "85.17.92.143"
 location: 
@@ -70,16 +82,15 @@ sources:
     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
-  tapicero: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/tapicero"
-    type: git
   webapp: 
-    revision: origin/version/0.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -97,7 +108,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -106,20 +117,22 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
@@ -130,8 +143,6 @@ stunnel:
 tags: 
   - amsterdam
   - disabled
-tor: 
-  bandwidth_rate: 100
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -168,32 +179,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
-      pUoaQQ==
+      MA0GCSqGSIb3DQEBCwUAA4ICAQCoWput9dEZAQQ9IkCqCLi+DUzzIEUe9oQCOi/h
+      xsJ1qVQqREegrxaxiis3CrpkJVnj0IGXuzA8OVGs2BMOlaQ4R+aF7KjpyAIeHyyV
+      7uFM0+I/GO6gHGld1c+CrWIOHTwRS8BmZ7nSXz1CvSWy/AqPp7lPqPjjGbs3sNkF
+      rA0Qc9PIv00cNhgSC9d4T6BVS3q03sfFqJoYGggT/OvYhGfyJin7iHePt6D4oQHS
+      aT8rk/NA5ajZQsdgDWb6O00xJRwvwMqTaQf0p3Ksx7dtsvzQGDyvQ51Isgwao7sy
+      D2MpKkdgodIIxbrOWyITBrFUVpW8g9fPsspyROUpS5cvocud+IhsV2RCm3hGVoSL
+      S/Dppzh4USWmO1rdpfnlOb8ctuJ1oXgllMczjkoN3kdJ48n0FRsfYHgxk/2IyoBz
+      OI1Mkv/EuqUCzIxbCDzhgY8bfDMCyApJ2+9gRyE7aPtiB10IWmHQv2XbEH5ia0dB
+      xyZ+f0BiFN6ic5t2rU6maqusQgoWwr7oSsDClUifW4SoDjNhoNdHoCaq+BqvJbhp
+      KzfsTefWiAuvN6OiHNrdZ/rz2AuigefHwjdwOf2ogYlVJv6A9Ss7K/5EqMaXBRtM
+      oA/+FGv/+fSCwaz3ry5MBh+NRTlapdOhChLkM6bKsSigXW6XWe4DexWvmVTp4mRB
+      Ph1Kuw==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -246,31 +262,55 @@ x509:
       -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index cec75f5..de92d38 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -13,6 +13,12 @@ domain:
   name: ladybug.bitmask.i
 enabled: true
 environment: disabled
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 22
+    to: "199.119.112.8"
+  stunnel: []
 hosts: {}
 ip_address: "199.119.112.8"
 location: 
@@ -42,16 +48,15 @@ sources:
     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
-  tapicero: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/tapicero"
-    type: git
   webapp: 
-    revision: origin/version/0.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -69,7 +74,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -78,20 +83,22 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
@@ -138,92 +145,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
-      CqJz60H5WKW3ETRjsmgetMitfBNho5s=
+      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
+      wCggTNDmjkLcu9w=
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      MIIJJwIBAAKCAgEA1iLpEIA9njUE/jpJm5iZbaN1uTqqOz3vGWioHG9Qma23rZno
-      LYR3tomTTRgVhRw6lYxTc67PU2KKvkbZx8w82QN/esoEvwCb/Q//ZcN+DNkfybs8
-      VmldQpe9DY/ccHHQtQh1O4ZaPUFioeIgoZXd/ssNPfj77M5aoR0Ud3Vif8Q/U9nd
-      I/W8anV4PlyjZXmfjg6NYcvzOWGFP1IYbBDgbU6ndp/2HkNDVjljKxnD8C0CCF15
-      pVIcyBS2Pli7jVsfKoGsrIhNcwG3ULBQrnw36x1K2EhDU/3c/W/Rsp0FO/OcHUYt
-      Gj+kRuoYrXWbtW6ecrWyedjRBfXST8D/K5DD6gQRYzDdyXyjHkVq4NUlWNjYp+XS
-      Me4shylumJk2YuN8VKzojnzGtk8gof0Ir3avb4cuA1i9LMQiDHDzguhmiv34MKB7
-      sRdXlCyMrIUICJF5B3RKmi4daRNgbI78yisVT79a3SNQKyE52F3WHlTqD/WM3bAU
-      n4J1x9UlIDpS/glT0uIbfnA3nkxHB4xYohM+u130uJ9CbfDOKXfVRcwZwn/GOLTj
-      rED5Xg5FmqGQUeAEH3q2WzoZoZB4jWt73FNJz6nJmkpzAQtcodVK9u0QZd4eY26R
-      OxynR427ezKkSkDo1x2RdvWQC0vyQp9EsUl72CZTUGf5tyJxGXW+39hNOj0CAwEA
-      AQKCAgAFmoZE00ZJhJOr33SbqMOjFdr3zOw1fqpqHM4BaHxQeTZMSbHEtym20iTT
-      qKSvhgyWa0Sny1RLl1GQJyR90P9qomfMm8rCAM8UMT36uMHsriXhzo+Gp100Z+of
-      l7sqCiBvDFidBSgJYFOnbtZxxA06JLAlBgX5rXC7tJobgivgsg8CL7pUvZJ/qrFJ
-      2HzCJAuj2QekHoUv5DhrbseK1Go7EgrZ1NfI9POnJvtMXnE9MMBT3bZYOCzeo4Qd
-      X48Q5OiM4TXWkf6M2uekKekCl+eStIKH5GQ2p3cH/swbA3bmmbplHbgCbtXqsSeS
-      Kni3p7xnvg98lsrpgARP5/oFdtVZlxYTgG0V6eVzhbisCVreYZw6gTTUi+ayCyWt
-      E1JUWQJjjvpKbgznEEIOHKwMQCTitLSO8K+8z1KiLQgtGXS3dEHUUpW4UtyipHPM
-      DHLhVAbJLX+Y2Lx91NFVyn4wr/5tONRUxxcnou7lLGltCy4Cn4+XYy6CGkLerQmM
-      ReIJxjZqA0Trb8oI66z0lNBggXkydtiV6ozJaoAA2wo2QauuDuTVk7M7w/Ix12k7
-      vh2cx2YblII2mWGTA2+Gkh/mIqXLxCXhK4sB4Ho3aVytSVUZ3NtrnkHQNrxjWHn7
-      e3lRiE1DXs8ipC/kRyIZjrHfGWA/Ks+HzXbJp+jrlS//nRFWgQKCAQEA/BJA+AZx
-      d3BHEbAggPS3EycLKiFV6UVliTA+G9BemRwkStIy89OyAcCB7JIDNb9sTcO6UrDt
-      ZCkgkblZbIa2O58ojyRKpSz8X3DzvVH1+y/C1j3xkmFTslIZrjuur9GRpeXmIsww
-      HMEGXYlRKwtdGOqXhswGUeDz0P+mWZkMbm+TGkpYCjsZ+WPyByorvOVZ8m0ut0ny
-      5XFs7S8Ogx6yqUknXilDqfSIADMTV0FOmoTfoJgkta5PLlocXK+lcDotJjFZqldq
-      lICll+FCXt2M/YDgBkf8iG25GPt8ZHq1ky5vz6gwVi+l34cZEEyZRqqHKZUvB1Pl
-      98MnxThluQrZnQKCAQEA2XlMikFsxY37mTRxgnppRrjoy+lSIfl//SHPOF/yLZsQ
-      +0MT+7BsxKAbekXfbM2NqOGbFhFl4LonLrx0xX4SaX03xc3JLTWQUxaSYXibLx9x
-      Dshj5NO7nvqHcnIdsW7ZhvB4gaUo1KA2Q/rImFKP/xVerPTQmpFngouuNSrYCtEb
-      2nxoa3BlBSKinasOUVF6fbureM7WzaaSlwdY43xfA+IN02XaAlnNmvkhIv9RVq4f
-      qq4+VwPRaVpMY6mxp8+JJXUgUdz7ACzB8BPHEE4ieW06UAouhmbsN/Kaub30kT9z
-      +0nvstn7lih7/J6P1rskpSpo4RUBk2G+BpFnTdbRIQKCAQABnJBDxa7GB7a8mzap
-      /GaLPc2peEsXUbVDekZ7YQqpye9FdzCSNIFH15Y9D/XrSw0DNkQjsTPjVwv5Qoka
-      04WovezBdYbwpWf7qDo2tKZw8644Nm8r82lYk4PMhF8qipl2yRB+mnWYSXej83PM
-      ZaczuJQ9bWKA9YI5jNjga8UTk60KFv2XGyegW445k4ByFblMfnw0+ckOxHngzlM2
-      bWTRBkG1LWhcVs7jyW/POACrpjvTyAU8ECA7eKIDya+yFv0g6GHdX++zgVsNrIgD
-      GUGEgWVtRNqNeL4dNcZm0g4FId/fIQEmG+ngkvmLDCJSvFZe4rBJSLUIr3u6nBCy
-      bSpVAoIBAHyNw2+fvwt6oTIC3kwLjgYqW3KGRDsfKdWxqnwwP4UtPdGafnR1fCY1
-      SOeD403ugIbMB8Xg2weVtmFHIF4IMcVnKS1KCkGxXuKnl9jpeX/IszjzPntNZTTN
-      agv7HdSEl2N4kJw4GqWEyO+wT3kmOECxXZMTd/I++xjCpVjgG/I+B4TgIfH+4mzJ
-      hHdnBAFA+DXQ6Yl8dXw9PdHwLFHF5qlTq/V6bR1Rj7eFnhvsPQq3GX3o4910W1jK
-      lduy0gQ5keP5LDSWqs9T0xOMUEOfbJE9JNu4qSLjCcGVWlatW8hgni27D+TQgg5j
-      S3fI3LrwXjGWk5DuNgPSREKAvrjPIuECggEAWw4tG6puzp72Wq8U4F/3VcWxsOid
-      sfGBnqsXmitxfnHHdjuwusMaRgcuR4E1Ao5iJkN8790lZa/fj4+wT2mZiborHFVx
-      RmDacQDJYJpFItQRthocNBUQ4gFoH2a/2olQ7JcBDbnQN0YZyyDgARpUE9E92+8C
-      yqsy2TkAWKFGFv6h2AV9yVga1cHukYkPjFhRXuUs4GZ2HB3eCMryC6m4q3V6SKx8
-      b8wjRpGqZ8TOugDdtjlCtF+qHwOpzOpOw8TpJuIqcIsIf3mJf88fWb6vwNvDI0jr
-      nz3Xq4HZm3rz8RCfSB69l0URkMFYdKV6cb0e8tskaR9KAEoIEpBTpAskOw==
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index f9934ea..9e416c7 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -65,6 +65,11 @@ 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: babcfe98e4
   key_lookup_domain: bitmask.net
 mynetworks: 
   - "176.53.69.13"
diff --git a/hiera/ovenbird.yaml b/hiera/ovenbird.yaml
index 7b6ba2b..1b5a396 100644
--- a/hiera/ovenbird.yaml
+++ b/hiera/ovenbird.yaml
@@ -114,6 +114,20 @@ domain:
   name: ovenbird.cdev.bitmask.net
 enabled: true
 environment: clientdev
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 22
+    to: "199.119.112.151"
+  stunnel: []
+  webapp: 
+    from: "*"
+    port: 
+      - 443
+      - 4430
+      - 6425
+      - 80
+    to: "199.119.112.151"
 haproxy: 
   couch: 
     listen_port: 4096
@@ -173,16 +187,15 @@ sources:
     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
-  tapicero: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/tapicero"
-    type: git
   webapp: 
-    revision: origin/version/0.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -200,7 +213,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -209,20 +222,22 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
@@ -329,10 +344,11 @@ webapp:
   secret_token: MwScfJR7TbrkhSbsYIkMLuac55J48rnt
   secure: false
   service_levels: 
-    ? "1"
-    : 
+    1: 
       description: "Please donate."
       name: free
+      services: 
+        - email
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -558,58 +574,88 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEcDCCAligAwIBAgIQZapGmb3M2eXlfyXvmTnKwDANBgkqhkiG9w0BAQsFADBK
-      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
-      MDAyMDAwMDAwWjAtMRAwDgYDVQQKDAdCaXRtYXNrMRkwFwYDVQQDDBBjZGV2LmJp
-      dG1hc2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvtDUNqCS
-      W8Gd3rdxG4fG+LGABxrD+A2CbwNJNZ1kte6t4h8h6bVAjIoVUzwt3fHbtoDGJAwi
-      IACZ5NQSBfAL0mZPu9EPhgBZNd5G/uzsYPAEOFlHuKRhlFsVJqApvlChkJpGFNoH
-      oDUGVWs4bmGq9e+Dc/6eouFGz8sqQfHWfKhnuX1T84oJGAzEm5pKIKkdUDMk9xIM
-      4SV+fKC5qrcmVDxpIgnJHI42sINSKS0xj9bhioGw5wFkstnxtpGNB3VDpaZ4pK/o
-      kw7NI9tHeguIxiMf1S9O4JeTyquShT6OXZrf1wR9nRS882cFnwruM9jsXbMILCeO
-      Y3Y7ZJ8c3jhtCQIDAQABo28wbTAdBgNVHQ4EFgQUkMbMHgml/FP5noJVRJ9C+oVs
-      lBEwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAkGA1UdEwQCMAAw
-      HwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQAD
-      ggIBAKNKgOnxYYiRSTNUYbAzfr5g6RmBndpc8vsFtcKcVtbIAm2HseiQLGqTbmIa
-      jbtbqd3138WG8wLDuiEVHeE8rzF1FMyncvJXFpee0X7BLWW+pm3qG4o+q49gxmZi
-      qN3+nUxMJWgw0ooK2nyzgp/AJ2iX8+b0oZTLCaG1SUAC8zoxbBlEmKldkpJSTVqE
-      gNBycX4+KQ9MrwsIqrDKCiKn2+IqmDThuaVmtkzXggLp6CsqJoedOiV3IAtxbl64
-      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
+      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
+      unY/ciI=
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index 870d47e..1a93088 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -13,6 +13,18 @@ domain:
   name: seahorse.bitmask.net
 enabled: true
 environment: disabled
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 4422
+    to: "199.119.112.12"
+  stunnel: []
+  vpn: 
+    from: "*"
+    port: 
+      - 20889
+      - "443"
+    to: "199.119.112.13"
 hosts: {}
 ip_address: "199.119.112.12"
 location: 
@@ -70,16 +82,15 @@ sources:
     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
-  tapicero: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/tapicero"
-    type: git
   webapp: 
-    revision: origin/version/0.7.1
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -97,7 +108,7 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
       type: ssh-rsa
     ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC3bBuUDDRRGjT1pWzHa69ylt46+ytxk7eW11MJ/RJ8jijj6pHLOPLtc8Ua6koMLzw/6Ob/Bl0lTd5YPqt0aBOylLRiyr+DG2ersbe8o28QVc2Jwy57yjS46bxJmS9gYfpFBr4hH8al4tRsiIBMcF4ZL5bzuMH0sOs/k5HlpRnC4cV5SGgIAD3/nivNp+o52bki40VQvNxFfNBTuNCQx7VH25pXyuGWT0tO0DLsXKi1k8S+SYzgs8hWL8Bpead5ay1Mc/e3ljqYRnEYe2rs7bnmUfCpsYIVw+mUbSASRFicoRVAsHMVakgA0PF2JC80JV4Qlj0k4CbhGW/GfKRqQ3+N
+      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==
@@ -106,20 +117,22 @@ ssh:
       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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     meskio: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
       type: ssh-rsa
     micah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+      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: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+      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"
@@ -130,8 +143,6 @@ stunnel:
 tags: 
   - dc
   - disabled
-tor: 
-  bandwidth_rate: 100
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -168,37 +179,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      MIIFqjCCA5KgAwIBAgIRANRdO/kKXusYGUU0RpRk7NowDQYJKoZIhvcNAQELBQAw
+      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MTAwMjAwMDAwMFoXDTE2
+      MTAwMjAwMDAwMFowHzEdMBsGA1UEAwwUc2VhaG9yc2UuYml0bWFzay5uZXQwggIi
+      MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDNPbLxqmVgB/r1YvYU0oA0rmlv
+      uXLe7hspni/9Vyu8HBOdY9a3W4rI8+bCGe1uQfUzW98FVwNmAoSTz9FCGm5JBeyZ
+      ee53BX82ErwMc/0Qh4zL5TbdEK3kP9BDcgP/8WJGpLFFWAE34NSBXEJyWv3vFZQt
+      pvCZiZfpCuituOkRtVpBLRdfYVVab9/mKtQIdVAKuz5gzuRzZnX2II532VCY8N45
+      ntpAdEF/jFXNwpPgRFv2mqHrIkOf7+L+boQ8FWD5xwXaDAXrkfJtCk12xEZc0K6I
+      1NgINpClfplebnnsXVJq3nHpZjeikJGKj3ucKtkdIjNoj5GNazC9E5+ZsQnNF9Bp
+      Qn5OUvKTfWhOYBvzhvUwkr4tsB9mBs+gGTaMJbZebhfSUwecEJHlesS27ZoxBfEe
+      giTZaLg+y8I69rOtacCvbOkOepKgWcrAKk97xGet/BEnWYFM38FvD/0HDv0uTwoM
+      dqv9DeV682oCt5CAJLwHJEwfGjqnR3wMCsvtWaHyloYEolprUbMunkCY6n6k0Ed7
+      auH9y5dihMKYFYpGlVq2bVG1Vq03vsGEYd+o5nxb7bkqsFlofU9nBlti54HKAWwq
+      Jsc9WJuHcVsV9eKwYUAeA41JlTJMCLtVQq27ca8hkho02iwDs2ZmLpo/iBv0AkHC
+      zXvSP2Pr+moxjRzm9wIDAQABo4G1MIGyMB0GA1UdDgQWBBTQA2tiHcR0hBH/UvNn
+      r8XT3lNQJTA5BgNVHREEMjAwghJzZWFob3JzZS5iaXRtYXNrLmmCFHNlYWhvcnNl
+      LmJpdG1hc2submV0hwTHd3AMMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
+      BQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdik
+      ce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEArnhFrO1LQwprxQoluxzdpTNm
+      DGKrI70Ou70+101+ie2PA+LLp5ncxVOEaaJM/CaPre5N1aHpm06AF3gFjWZflOwk
+      8iydaqulij2bKbcZpyflh5k6CcO38zLDuewsp/Bk8RSAzylOVvye7nAFmG3GPZ3Q
+      9a9IK1ZeK/sRzEPLok3RDSYLW2VOQpaFi9xYsVKzMai3W6BSRZWiqELhawVvxwbn
+      xBxb5GgtkI2YkNCEHHlq9RvdP+x5wSUw4djP/xRe53QI2bMJzS1US3B5dzOZj/PD
+      1rT8l6K4/eIUS68P/UltGUeMw3pBDxlWzIGCxs43vje617eMDGAvC5uzO5MIQ70v
+      ZeohirNSzs+YpC5H2wpeF8zmnnHCj17DrdZoQm5k5Kom/N2hV4kX/2GG8FiJ0lzD
+      Tq6BPEBGFaI/K7uKrt8YUfIOSXSDZwJVBjQCCMNEst6drQHeJ09a4acFbt1nhHk0
+      ht0w1I+g86ne+x71PUSHdbGPMj8QcvjkhOVQ6BB/3WQ5ABKkZC4brQzX8TqgE3Rk
+      ddwPYVzfn1sNiu8RTrxyMDlBjvWrsKyGOwFnlIwuYlj8Fsa5cgabUnwGk5uozVm6
+      iWLF8cR83nIBnr8rEs4/IogNAezq5T4v/YDL7As4upiwB0HAWRoRpqZoS3i8eQJh
+      JgxpgA53CIsgMYavhKU=
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -251,55 +262,55 @@ x509:
       -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 596bcdb..c3b7964 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -65,6 +65,11 @@ 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: babcfe98e4
   key_lookup_domain: dev.bitmask.net
 mynetworks: 
   - "176.53.69.13"
author	varac <varacanero@zeromail.org>	2016-02-24 22:11:14 +0100
committer	varac <varacanero@zeromail.org>	2016-02-24 22:11:14 +0100
commit	d11a0478948d5938a978bd6a9789915c1f7b7115 (patch)
tree	33303f0a0c47cba64fea108badf9f0e98c16b478 /hiera
parent	f9d04f1ec4e381e7c40309ff89760d6d85b6a345 (diff)