Use new experimental-platform deb repo

23 files changed, 126 insertions, 345 deletions

diff --git a/common.clientdev.json b/common.clientdev.json
index e95e574..e2cd7ce 100644
--- a/common.clientdev.json
+++ b/common.clientdev.json
@@ -2,7 +2,7 @@
   "sources": {
     "platform": {
       "apt": {
-        "basic": "http://deb.leap.se/experimental-0.9"
+        "basic": "http://deb.leap.se/experimental-platform"
       }
     }
   }
diff --git a/common.development.json b/common.development.json
new file mode 100644
index 0000000..18ee9a5
--- /dev/null
+++ b/common.development.json
@@ -0,0 +1,12 @@
+{
+  "sources": {
+    "platform": {
+      "apt": {
+        "basic": "http://deb.leap.se/experimental-platform"
+      }
+    },
+    "nickserver": {
+      "revision": "master"
+    }
+  }
+}
diff --git a/common.mail.json b/common.mail.json
index e95e574..c15285e 100644
--- a/common.mail.json
+++ b/common.mail.json
@@ -2,7 +2,7 @@
   "sources": {
     "platform": {
       "apt": {
-        "basic": "http://deb.leap.se/experimental-0.9"
+        "basic": "http://deb.leap.se/0.9"
       }
     }
   }
diff --git a/common.unstable.json b/common.unstable.json
index 5473d98..18ee9a5 100644
--- a/common.unstable.json
+++ b/common.unstable.json
@@ -2,7 +2,7 @@
   "sources": {
     "platform": {
       "apt": {
-        "basic": "http://deb.leap.se/experimental-0.9"
+        "basic": "http://deb.leap.se/experimental-platform"
       }
     },
     "nickserver": {
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index a6cecf7..6669f83 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -82,8 +82,8 @@ mail:
     - cat.unstable.bitmask.net
 name: aardwolf
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - couchdb
@@ -111,13 +111,13 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 7572294..76a5f91 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -273,7 +273,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index d08550b..3c22488 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -75,8 +75,8 @@ mail:
   smarthost: []
 name: ant
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - couchdb
@@ -99,18 +99,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 735bbd1..42030dd 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -101,8 +101,8 @@ mynetworks:
   - "46.165.242.166"
 name: cat
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 rbls: 
   - zen.spamhaus.org
 service_type: user_service
@@ -123,13 +123,13 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -354,149 +354,9 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
-  commercial_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIGDDCCBPSgAwIBAgISA0Bx308Dieu3QopitJm8N3QNMA0GCSqGSIb3DQEBCwUA
-      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEyMTkwODM2MDBaFw0x
-      NzAzMTkwODM2MDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
-      IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
-      /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
-      IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
-      pVsS6MUfUUPVnjBMs+08Lgt0QDtlQLU75z5kplFJZtG/pv7lGkQhyZOO+Qttm5wd
-      T0J3DqFdCa3GP2cz1IY2Up1ICwTLWct4Hs4MCUCzdb04JjoiYUNxGW1iCu1bEIdC
-      x8FJpzpzWIHHeSbIpGNnB1om50JjrY/J/YeSDtz1WOT4wkKxHEqrKmmlL5KRGsP2
-      lln6t5dplpXVXCVRl3+E7kdl3H4kDY5VdjOYEcmofdMVhdeYG+Cmz5ZojRF0gxSa
-      bzu8Afed/ZKShVNicPx6qtmzfpyP3fP61n/TaC//6+IxY65hU7fpmlp+yw9OpK71
-      SMHJ1aiF7oNrzUzl5cITkPFtjsc1Kf8gAb4SRR0lN1Ty9YINH/c2YGFqfHyqdwZw
-      CGILXXp6ryiud50aPIMyGWKWedzyeKssk8eXMoHHFCa490Ux2QVlIn9QayNsJCXX
-      LJ8VpCxA2E3PWB14MoP0Qq7Hm9FFBncYSjEN6IH62TTOUZDqmzeWQvkxGSKQbZ7z
-      FQISXPFJ/aPQoHfYAGkCAwEAAaOCAhUwggIRMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-      FgQUl9o/MaPxASJRbiGJucZoNMTa3kswHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3
-      pkVl7/Oo7KEwcAYIKwYBBQUHAQEEZDBiMC8GCCsGAQUFBzABhiNodHRwOi8vb2Nz
-      cC5pbnQteDMubGV0c2VuY3J5cHQub3JnLzAvBggrBgEFBQcwAoYjaHR0cDovL2Nl
-      cnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8wHwYDVR0RBBgwFoIUdW5zdGFibGUu
-      Yml0bWFzay5uZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8T
-      AQEBMIHWMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCB
-      qwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJl
-      bGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRh
-      bmNlIHdpdGggdGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczov
-      L2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEA
-      EKevXHgIMHV6f1bpo6qckNuiTV8DuinHU42tVtjWjgrvz3MRzXzUsFZgJI/LFx2q
-      NEeHBAgTyls5CAVI/fevu5cXILLbVoGYeQNghwTE0AzCWuflNur2mKg8MCNHyVAh
-      9AKZtzF7qRvw2H/hWbt8SfuNfxKpSiWyj6B4gzdJ0BrbxbmW92sV5H7yzasBQrIt
-      UAJ395WK0agIXS4ER80RHBCTyEysdyBozHijN5NeUDvYQnZJTY7R1271MUHoQKmd
-      tnFBKbUd04DopbtguCP8X0WNYT6YQTBcQZJl1muTNIFp9KKAgvf/tZZIM6cb+WXZ
-      uGuL7ez7NehjPVp40GscZg==
-      -----END CERTIFICATE-----
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
-  commercial_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIJKAIBAAKCAgEAvXmypjqMjBDcg3Djbhk1h4U2ild+jx65unl6rNLJ0nPoYKMF
@@ -550,4 +410,4 @@ x509:
       EE7uMNuHbC0kZJD0GMN/t+TqPcbClrGbjclgVFzdp2OxQmEvmsAVx6qSu/8=
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: true
+  use_commercial: false
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 220090b..fdb8073 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -82,8 +82,8 @@ mail:
     - snail.dev.bitmask.net
 name: clam
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - couchdb
@@ -106,18 +106,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index ad90ef9..00195c1 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -32,8 +32,8 @@ mail:
     - snail.dev.bitmask.net
 name: demodex
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: internal_service
 services: 
   - backup
@@ -47,18 +47,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index 70e7392..b340cf0 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -40,8 +40,8 @@ mail:
   smarthost: []
 name: diplocaulus
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - static
@@ -55,18 +55,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -123,7 +123,7 @@ static:
   bootstrap_files: 
     client_version: 
       max: ~
-      min: "0.7"
+      min: "0.9.4"
     domain: bitmask.net
     enabled: true
     provider_json: ~
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 56b75bc..0dc7349 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -543,8 +543,8 @@ nickserver:
   domain: nicknym.unstable.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - monitor
@@ -565,7 +565,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
@@ -685,7 +685,7 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
+    min: "0.9.4"
   couchdb_admin_user: 
     password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
     salt: b9d35fd378ba1598e843d5a784cfdf7e
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
index 1df559f..b218bcf 100644
--- a/hiera/dotterel.yaml
+++ b/hiera/dotterel.yaml
@@ -32,8 +32,8 @@ mail:
     - snail.dev.bitmask.net
 name: dotterel
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: internal_service
 services: 
   - tor
@@ -47,18 +47,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index e1691f0..750d3aa 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -206,8 +206,8 @@ nickserver:
   domain: nicknym.dev.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - webapp
@@ -221,12 +221,12 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
@@ -338,7 +338,7 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
+    min: "0.9.4"
   couchdb_admin_user: 
     password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH
     salt: 51d3c78980b9cf319cadbc73896f7128
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index cb6ca90..9b15168 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -217,8 +217,8 @@ nickserver:
   domain: nicknym.demo.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - webapp
@@ -232,18 +232,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -339,7 +339,7 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
+    min: "0.9.4"
   couchdb_admin_user: 
     password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
     salt: e1dca99375c513be477295f141b9f032
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index dd4f87a..ebc3cbf 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -213,8 +213,8 @@ nickserver:
   domain: nicknym.cdev.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 rbls: 
   - zen.spamhaus.org
 service_type: public_service
@@ -231,18 +231,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -341,7 +341,7 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
+    min: "0.9.4"
   couchdb_admin_user: 
     password: abVQmkZubeAvncgcVSYRD4_pHANEItWb
     salt: a5a58ff4365be3113f19014ea3050129
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 2ca0f02..aa7c731 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -64,8 +64,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: user_service
 services: 
   - openvpn
@@ -79,18 +79,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/newt.yaml b/hiera/newt.yaml
index 08d7526..c3632c7 100644
--- a/hiera/newt.yaml
+++ b/hiera/newt.yaml
@@ -32,8 +32,8 @@ mail:
     - snail.dev.bitmask.net
 name: newt
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: internal_service
 services: 
   - backup
@@ -47,18 +47,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 2787137..458e4d7 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -64,8 +64,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: user_service
 services: 
   - openvpn
@@ -80,18 +80,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 94be5ba..6a024b0 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -136,8 +136,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 rbls: 
   - zen.spamhaus.org
 service_type: user_service
@@ -154,18 +154,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -390,118 +390,9 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
-  commercial_cert: |
-      -----BEGIN CERTIFICATE-----
-      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
-      -----END CERTIFICATE-----
-  commercial_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIJKAIBAAKCAgEAuAphpZXBeuDafyiOl9/iKcgTNTq8/t08CFqX3lW2iJBYidNA
-      jj8zf0gV3XVoXkFTFr+u5keBzfZaWhOQ3HwOga48HWrXJAdlsSl3GwZB+8MgLBAo
-      0t0jQlhMqAgANwbh2zFcbw/pXDB0GnlX5sPwmiuGnfSIkvco3Qj82cdsdJhCZ2kb
-      HHDBXGwgqTl1EwLVj0LnXBFPwSV/YKGFwWgr1d/D+5OEd8wtIH+/9LdujohGRgXj
-      m4pPFlfuRgr5RHoz8PY5QwMpGafA46Xq9f+L5cXV8HKc8jOmQYCehgTSD1eKw97B
-      FmBnJJyIIieNBDj2NG0GFACUPPk+MdVlzVox7fIPvXwzW7vnBRwK52yEBFPGXoNV
-      lL7iC7+wN5nHJKktI88W8a7C30ZQYzpeupVLVPPGUJFJMp6JPBPvfl2gUz8JlP95
-      v8GxHepco/qOLUSLXS//YQRY+KS34XNjnsZNGpEFpsLWE4QchtF+ALZ9oOtuzru6
-      MgmXW3GBlwNPkJ98V9eIPHY1BS4tgeaO+Hf27590EbKE8x9HVPBl1/KlQiTWlI7K
-      kd8XqS0re3OZ23aLZyLj/1ZvzpI3hk2/RlM+9uN6KS/9RodQJUWBc/iOoM8A7RW7
-      587hZmYeuyi5ibAfrcyK4x/ldhdtblJngOr1FIJYAHFpFFsHjg/iKhZLd8MCAwEA
-      AQKCAgBpDTv5ycbcPjdaeCsU1C4DzXnxW2sATAZ1ekjQF7sOrt5rJdPmnnrlv58D
-      f34otz8XcCkEt3KHv4SJgDujL4kUSwFzhUXzAenxO4sKOQM3E4VswXicDLCQsVho
-      XdDJmDsZ5E4v8zQwdFQBvJwJVHUle4zm4uuGgGCp8vRp12S4FSVqY9ue21n0SKBI
-      GE0UofyHPxhTPGp7BM11uh1gbfb/qS/0jZsCyuBDech3hrEr2OvMEpZ+dW95gI25
-      G5B3nw3BELtU3hv60f/PsiixbMJNUSUykCm4MvVG1IUoWN4S9dR2w9MR08tsYZFv
-      dYYQD/exqz3Z8w6q01bGGVp34nE2ujzqcnpjGAuF8K/LEOSleKuCpo8+hSfRtBN/
-      sc4y0t2qDdreq6HcJQAkzVrPz92DB0t5ggIIgVfOTRckjJOzqZAV82LvC0g883Wa
-      CTaWhY1cfmgWybeenj+FtfCFsXOKyOIcx6Gj4o+/Z5onT567UF3RHVNx30gqnlay
-      1BuLZOwwIno1PT9gqVxM96FtErPVcU2+oDCzu5m4iHlpxYVpufqGF7IhiIIvT9wy
-      wqUrDJMbjcziEy01LTi6Xpk/e/z1tvEqof5iG0tk1HY4A3yYIHWaTsl/zjLyATa1
-      NKqJGXyhmC/7X94BJQ6AZ2b1u1RdGy1Iynp3/RlPzvwyvaN8cQKCAQEA5tsejLTh
-      b5EZX2M0JH883h6BrTVY53vE1fhIuSE9615XL6LfGUpiC4ifXw6378tmQvwK90YU
-      2likIb2bNZSV/6Hkidgt5I3LitkqKPRVrJXirQnJMRY93d3/11pE9VO0BtoqiVOd
-      c/H2MXMU6Eam1IpxE3JMuf9JytY5nWYgA/5aHaiyqnrzQA3TgNqDuzJVZl5DvDPQ
-      DFpU0i0JzAJRO5+U0FVhxHUKF97GqYCCr1gLjoET1qUJGOl3gsQgjG7cjq2y1Ify
-      cXE3u4ApZps4iH0gnXGW44Bh++qSEF/+pchSGdWouEMlkI2Wkep402Gnmv6bXFIl
-      33ylD9ivG5RYuwKCAQEAzBXskBtXl85NC/2wD28BOLPrFWnI4qeFkFgNt9QjFACZ
-      La176z9ZcLQOy0EHfmUihdobyvHY4SC9d+xOsYvINzOhBlG580KmD8IfZJxXfk+l
-      LJKeExCGabaTvlxcvRKHBZbIgiQoR/gFUHOabwgIUqBHYasKK6/l3UULBuW2tOky
-      i3PzRJ9qhmTISS3wl8fdnVZ81essOmiKiR07Z3tpoWgbGFQ1ZzhhflHh376pbYg6
-      JN9N2a0xPSA17WYC9Ng1E08y+jAbqjPBmXMxvqdcVWTa4tBirEdjRnTanSiwy2mP
-      jQEff4O0Wyl3Zjdffg2hLP9S7AV1Hr7rby94IjhQmQKCAQBMy21xLyai/2iqU4zf
-      6zerSAipPsrRTlnfN9WxR/6aEmr8XLjMZ/MPlSY27+V+LnJZLBDVywlazQvkcXd1
-      LnVrcUZeGHzDv+uKx8z/jLAHVmDuYQf9fUGdUaEu2UeBOJP1h5OI1TjWfhIAxyCY
-      WBBdOaR97JLbeLHqeLL3yiYyTeVaYmj0zyumDjNidM5Hcmn4QLlVnQLDaTU4KWVN
-      6SNuqxpM52o7eRefcysw7aALhkVp5URdLc9F6zwnUujk7mgOSnfnvUWIOTpp9CtR
-      h6cZuE4mMcgY6/csXw6xxc0nBulQ0MNscGHJoWAKMC57WsvvgmzaHDWfD461I8a0
-      bPfLAoIBAHrtXb9zaLBcqBXn6YtyTmcMIDaWsFStmQrXrvOiSLq8nYdg7rpFPyde
-      nWaaNdxRKJk9Re5Y/EymPtmkMcZJrwBpDb3TrlCzPXlScTxV23GOoawWaDaNhpjY
-      S2enFIkiRsf8CawyAT1QTEsoRsZILVMvja9rqcWkvq0n8DtoVEPmDvbmkYotB6oJ
-      vIYvsLKLxZYGyUzEybAo1gE+5VAwivCY13ExD7WrxTWkNoxhuIXsPzGEe8z4wCbU
-      ZwcmofM+48FMvCTso01CvYMjWrw+7KPXCu0Bnd2tZkPDEQcGwm7Tl47UNVfGSfV7
-      JZshEVjI9uM2q4jUxLYPQ5qGGjNqfkkCggEBANMXlT7EI0HWte6hEx297OIBs3MC
-      YkX8F3wt1x22OFWDOv/7sqM5qahyXewZnydknT8DUqjws+gCmW3BgKmmOpYLUzfM
-      EUxyLZYcUtsxszdK4JjYA3xqIYS2/HTtKkgA5DrnN9nS7iCjVoRvtY/DQuIQrqSN
-      Rf0s5vlZA7PkUNA5UyjWXHvS0bQtPlxDtk0meeusV4bDVYbOpEWQ4K87MHN6aJhX
-      7TfrYzfGPylPyEQ6VTMhn7vc1dgvVd3NCILkWpXPflMsn3waTnHGcDzo8Igc+7Kb
-      3KQVnilUwa+mOZHgLobGsFy+L1wa2ZcYyjB1JKCZAgyzvkgOKT2sk8DrOE0=
-      -----END RSA PRIVATE KEY-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   dh: |
       -----BEGIN DH PARAMETERS-----
       MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
@@ -567,4 +458,4 @@ x509:
       mI9hprJ3XwwY22nbWRcWnHc3t5GbBkqCI+seCYolljuh5RLc1XFyy8Obb703
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: true
+  use_commercial: false
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index ab561fa..59b7411 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -64,8 +64,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: user_service
 services: 
   - openvpn
@@ -84,13 +84,13 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/zebra.yaml b/hiera/zebra.yaml
index c264921..4f5a1ad 100644
--- a/hiera/zebra.yaml
+++ b/hiera/zebra.yaml
@@ -80,8 +80,8 @@ mail:
     - lynx.cdev.bitmask.net
 name: zebra
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - couchdb
@@ -104,18 +104,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/secrets.json b/secrets.json
index 0a660c3..6692fda 100644
--- a/secrets.json
+++ b/secrets.json
@@ -58,6 +58,24 @@
     "tor_family": "uSaR9IekHdQGUGIRrdThPFW64_JYgEnr",
     "webapp_secret_token": "_DLZ7e9YhU_d3HDCWFzCMd3WnC4QaP__"
   },
+  "local": {
+    "api_monitor_auth_token": "nwAp9zEtYRU3RcFVzxmS77RdPgJnYemu",
+    "couch_admin_password": "ckgPTTq4RDkPN2rpnwfxI3JaDVaSSpUJ",
+    "couch_admin_password_salt": "7a64c2c8cb8d9d99b75897911538a2b4",
+    "couch_leap_mx_password": "jd2WB8DeD8AfZ8arBucZcQFN5yaC8vsX",
+    "couch_leap_mx_password_salt": "6c962c27c1c010e96695e20368b712a9",
+    "couch_nickserver_password": "sqapFFqRxhrPPrCZD83X4yVBt2sQXmhK",
+    "couch_nickserver_password_salt": "67222a82f802f5a88d9f11e930d152e0",
+    "couch_replication_password": "eU2pMFtDkpIzx5A9KRuYQQ9qKXRYVJS7",
+    "couch_replication_password_salt": "74a46b9b60b339d90360904a0a1d1b8e",
+    "couch_soledad_password": "QMXUs4BzIWLyUJfA4xF4abUUaI8VDJm5",
+    "couch_soledad_password_salt": "eb5711e2bc1e9bcac9ef629d434c1c78",
+    "couch_webapp_password": "Ka5WRs88QBEbEhdqP9AzgN2CmRhYZdgn",
+    "couch_webapp_password_salt": "ceca7f0764fb5b39a1a81a564bf3188c",
+    "nagios_admin_password": "nrSTILJJQ5UgBmkSrvSdthzIjE8cMUbM",
+    "nagios_test_password": "QkxvsHUuCjzttbxxYdbdbFx9XDX5TLSj",
+    "webapp_secret_token": "Q2uCMkDwZ2KBSgH3jveSbgQwmS8sD5tz"
+  },
   "mail": {
     "api_monitor_auth_token": "vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2",
     "couch_admin_password": "5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw",