upgrade demo.bm to jessie, migrate to plain couch

1 files changed, 42 insertions, 34 deletions

diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 43b47fe..e025bbb 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -1,5 +1,6 @@
 --- 
 api: 
+  ca_cert_uri: "https://demo.bitmask.net/ca.crt"
   domain: api.demo.bitmask.net
   port: 4430
 contacts: 
@@ -116,6 +117,7 @@ definition_files:
           }
         },
         "services": [
+          "= enabled_services",
           "openvpn"
         ]
       }
@@ -143,9 +145,9 @@ definition_files:
   soledad_service: |-
       {
         "hosts": {
-          "thrips": {
-            "hostname": "thrips.demo.bitmask.net",
-            "ip_address": "204.13.164.162",
+          "ant": {
+            "hostname": "ant.demo.bitmask.net",
+            "ip_address": "198.252.153.82",
             "location": "seattle__wa",
             "port": 2323
           }
@@ -178,6 +180,20 @@ domain:
   name: wallaby.demo.bitmask.net
 enabled: true
 environment: demo
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 4422
+    to: "204.13.164.57"
+  stunnel: []
+  webapp: 
+    from: "*"
+    port: 
+      - 443
+      - 4430
+      - 6425
+      - 80
+    to: "204.13.164.57"
 haproxy: 
   couch: 
     listen_port: 4096
@@ -188,12 +204,6 @@ haproxy:
         port: 4000
         weight: 100
         writable: true
-      thrips: 
-        backup: false
-        host: localhost
-        port: 4001
-        weight: 100
-        writable: true
 hosts: 
   ant: 
     domain_full: ant.demo.bitmask.net
@@ -207,12 +217,6 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo="
     ip_address: "198.252.153.85"
     port: 4422
-  thrips: 
-    domain_full: thrips.demo.bitmask.net
-    domain_internal: thrips.demo.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0="
-    ip_address: "204.13.164.162"
-    port: 4422
 ip_address: "204.13.164.57"
 location: 
   country_code: US
@@ -231,8 +235,8 @@ nickserver:
   domain: nicknym.demo.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.7"
-  version: "0.7.1"
+  major_version: "0.8"
+  version: "0.8"
 service_type: public_service
 services: 
   - webapp
@@ -249,16 +253,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: 
@@ -276,7 +279,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==
@@ -285,20 +288,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"
@@ -311,11 +316,6 @@ stunnel:
         connect: ant.demo.bitmask.i
         connect_port: 15984
         original_port: 5984
-      thrips_5984: 
-        accept_port: 4001
-        connect: thrips.demo.bitmask.i
-        connect_port: 15984
-        original_port: 5984
   servers: {}
 tags: 
   - demo
@@ -352,6 +352,7 @@ webapp:
     salt: c632af58769857bcdf108b46da9eaa44
     username: webapp
   customization_dir: /srv/leap/files/webapp/
+  default_locale: en
   default_service_level: 1
   domain: demo.bitmask.net
   engines: 
@@ -394,6 +395,11 @@ webapp:
     - tickets
     - vmail
     - www-data
+  locales: 
+    - de
+    - en
+    - es
+    - pt
   modules: 
     - billing
     - help
@@ -404,10 +410,12 @@ webapp:
   secret_token: GgKvW3NhAKwgvQuMAzdHhLDBh3g3u5Xd
   secure: true
   service_levels: 
-    ? "1"
-    : 
+    1: 
       description: "Please donate."
       name: free
+      services: 
+        - eip
+        - email
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----