1 files changed, 107 insertions, 61 deletions

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-----