leap compile, use leap_web:develop on unstable

19 files changed, 218 insertions, 195 deletions

diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index bed7d6b..604d041 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -242,8 +242,8 @@ nickserver:
   domain: nicknym.mail.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 rbls: 
   - zen.spamhaus.org
 service_type: public_service
@@ -275,7 +275,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 675a846..2a6f2d0 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -82,8 +82,8 @@ mail:
     - leech.demo.bitmask.net
 name: ant
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: public_service
 services: 
   - couchdb
@@ -111,7 +111,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 16579b6..55f3107 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -82,8 +82,8 @@ mail:
     - snail.dev.bitmask.net
 name: clam
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: public_service
 services: 
   - couchdb
@@ -111,7 +111,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index d6721b3..ed3f671 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -32,8 +32,8 @@ mail:
     - snail.dev.bitmask.net
 name: demodex
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: internal_service
 services: 
   - backup
@@ -52,7 +52,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index 3113de6..482045c 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -36,8 +36,8 @@ mail:
   smarthost: []
 name: diplocaulus
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: public_service
 services: 
   - static
@@ -56,7 +56,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
@@ -150,20 +150,20 @@ static:
           PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
           KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
           -----END CERTIFICATE-----
-      cert: |-
+      cert: |
           -----BEGIN CERTIFICATE-----
-          MIIFCzCCA/OgAwIBAgISA+jsGoAwcxUbypA6PbIZkQngMA0GCSqGSIb3DQEBCwUA
+          MIIFCzCCA/OgAwIBAgISA0RbcLLphbgYuEsfQzGcvut9MA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA0MTUxOTU0MDBaFw0x
-          NjA3MTQxOTU0MDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIIBIjANBgkqhkiG
-          9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNwj9ihHw863j/NZo5eyd3cuhe4KJNT9eGQ9
-          19Cabz7Oxg+xLlXtAcIqa/RQUmI4wLS8duZ96ElntSCZk56uVaaTQrpo2Fzfe9kg
-          oz+rK8NoQvBUkb3eTxflyUxJjAf5FukCQwq8WIYhBzQ52QLWxscl6Gf8Vtkq3X2P
-          6uN5sFSN603PkbmylDmlFuz1v3lsFqfwtc+1UeZZVnra4kHRoCaK0bOggcCsE4a4
-          /gMGiccfA2WgOe8zsn8E/QLj3Bs2gTfkAmRYFWh6ZNLE4do6+JJltC5UTsmUq3V7
-          R0Im6UevaVjuVputC4aG83nU7nm//RC1+JZzJUgoTng6JwMVUwIDAQABo4ICHTCC
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA3MTUwNDU2MDBaFw0x
+          NjEwMTMwNDU2MDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIIBIjANBgkqhkiG
+          9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsl/1Navu2WH/b9+ASMido2GUU1VbY8gfU1V9
+          WxkMQ12l4HhKwnqvxvsOC4yFm/WP3GBsYhbJpzSMTzQPMQyA/C5g6X1dLKCd5gHr
+          CisaaHQxyYFPHvFXQDDUZfyt6hEqoG4MbHe1E29h3xN6DCi8KYwk+ozcsQi9cGEH
+          ViR4dTDpM0iCvzNDZFwwgI9Nj2lCp5staBSFafSK5iUzP4PgWtGsqot2/zZtv8+R
+          nwDqwDLSXz5J8bqTxb9y0e44+XdgCHB1EzRTSGbvl4PqlIKdBvRsoAuZGL5rJi/O
+          FOHQMM0Sm9Aq6/wm+mnHGk7SMlXFAfRODiMAAYs6ojcOxFqlLQIDAQABo4ICHTCC
           AhkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-          AjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQhPQnU12X9L0BofIkPHlj/xN8x9zAf
+          AjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQXqcpBvj0bMxh/n4hLJOShDqr7LDAf
           BgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBwBggrBgEFBQcBAQRkMGIw
           LwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcv
           MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
@@ -173,41 +173,41 @@ static:
           VGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBvbiBieSBSZWx5
           aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0
           aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcv
-          cmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEi/xtNPUOTwICAGC/Naaj8Z
-          BuLLYRMy1Lbs1cBlmZ6ki7hw4vZIh+MAA4MMbKrJxK+WQnpMVKmE27acUSxXrCX4
-          H69CSlGmrvgvPFL7sv1l75MVzh08Tp4B2+Q+3KbxH8Qgxs7HPfvAeZyFwG7ozVR/
-          lwkqJfqpI/3N4aRqkex+k4NsCIldLlouGWaWGua5aznQWOWVRs/1mOPfbuDPRSL4
-          f+4izk2FqRZ9pOgebq3XGGTdodzJ2x7SDCp01ng8RYLKf9FPmCWwcwobZ19mAF6k
-          gDsjskMw5oiuu5mmLfLx+wLasIncPuBO5qFLoIGAwmy1KCrPpviemjYwYJ9HLv4=
+          cmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEv1STC/T4Vn5eN0UjdUuwGb
+          pyFpJllC7IpFtCKLlG4O10JnH5+UEM69tpqL91PBe16YvSz8OdrGtUc9XhccpjUU
+          sCl0HyUAIty5ivkg0+HeglQICLrbdZ4Men2dm2BKXvqNlR4QkzSOrTwT3OKdRtNs
+          3B9COQ/Gif5ofiFeIllQbX8vWpG6rEnwgLrGwWoj0QQj+7qrrxJYq6FJb9y/jA4c
+          U3gK4aWbAiyX8a5ICSFozZXL45aKC49wPFXW/C8mqkQv6oMRJgmfYU81TdnZZt/o
+          mESgmJa1Ra6ZIEt5Y5OUvtBdeOO2+jHhRA6ARk2dZKhKpQwm1HB4mSlizUrj1HA=
           -----END CERTIFICATE-----
       key: |
           -----BEGIN PRIVATE KEY-----
-          MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC43CP2KEfDzreP
-          81mjl7J3dy6F7gok1P14ZD3X0JpvPs7GD7EuVe0Bwipr9FBSYjjAtLx25n3oSWe1
-          IJmTnq5VppNCumjYXN972SCjP6srw2hC8FSRvd5PF+XJTEmMB/kW6QJDCrxYhiEH
-          NDnZAtbGxyXoZ/xW2SrdfY/q43mwVI3rTc+RubKUOaUW7PW/eWwWp/C1z7VR5llW
-          etriQdGgJorRs6CBwKwThrj+AwaJxx8DZaA57zOyfwT9AuPcGzaBN+QCZFgVaHpk
-          0sTh2jr4kmW0LlROyZSrdXtHQibpR69pWO5Wm60LhobzedTueb/9ELX4lnMlSChO
-          eDonAxVTAgMBAAECggEAa/2GMI3VZqjDCR/jFLNQuYNxNSIa4Otf60275vBg1238
-          gy21ltjxbJ6OA6Skq4vflYu/sUHy+ZiwMdqKfPcs5rI5wrh8+TBACeyMqXFPQHCV
-          3szgyob9cH0IarDbIieiNuUFwj5qStiIQNoclQ6Yg2ThW0Qr4FxbMyrfwRsEAqJT
-          Mrl86B692MEOa634YVYcefoIYG3AfSdRg/4BF1fe+mpezrqp4hnTOW/dNyEpJRro
-          sXQVeJk+vW2sfxfyBwKon24t4wV15GgS98JgBYGR1+w7FwyKvlHozkq7MqynD5JJ
-          FfoCtVJ7jf6JHQ66/1yBLCUzJMpF4ybYtQty8j8UgQKBgQDvdw3HppH9Y7E6FDyd
-          O09T+0zgkdUtF0L7muXtcSn9cBwaoQNHU2z/eAqY2cv++BeZEF4d5LZdp6LTGflF
-          fnT6t02mtE7UU2YhI3vwTCC25fnceXg+Ym7VTqwTXq26PfDnV09AVjRbgxvSZ8yY
-          kPD9Ehg8Ww6KlhdpSGIEkZDFkwKBgQDFn9l1pKO9TBbiLQGdjDEdz11f0Opq8tuY
-          xHi49KJJvN+g6KSuw/hkXNLCunnNEMCixfL7QdUfNCXPJWL8RiXRbfsidppi8nfF
-          aeDYXs2MAaa5oecbbxu+odtPQIEMWJNTO22DnMb8XjQALncbTkWXCsiMswF5grb+
-          75d4Ra5JQQKBgQDMz8Hccg5JcBvj9e0F+fVWegh9xp1SzKOAuTJRDEoCtwGCkRZR
-          yfve4NgHdbixoZXlV4d3/+cuYTO1ZHC8THVW/rKOk4ccuRwP2d6mXyZX6Ij1VntO
-          uDfdf0VT59WlBldmNlnVSCXN42xHYHowPz+u4+wQqzzbsZXieYNELxBouwKBgAKT
-          QKwtxwxyb2HnIDxDVWiECT10ZXmbTI1DEiem2G6JjYh1P6AfYZ89LmnnMCsh6sC0
-          P6RSiUpszYlTfWS4LUn7WuhqDzz21+S0qn9nTNpkMx38JBzRZ9UmGst/la7pgJH3
-          Fkg+xMEJIThXYqnybSm4tEBRHNXOhD/yM1EX51uBAoGAbAMbAGZVmdhTTz223wqj
-          Id0uTobOEATAV6IvF82wThI/2JJmNwx8eFlWBymGcLIi/6rxJAMeC9Gkf45T+cQ9
-          92IHd+RYHns35WuoBJ/2y1qBN2t6EZAW2d7mlpzm0dCp2RSMOmGLKSy2ZxwH8c3R
-          PJMPWT6n/OZwL+8i6xRdL0M=
+          MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyX/U1q+7ZYf9v
+          34BIyJ2jYZRTVVtjyB9TVX1bGQxDXaXgeErCeq/G+w4LjIWb9Y/cYGxiFsmnNIxP
+          NA8xDID8LmDpfV0soJ3mAesKKxpodDHJgU8e8VdAMNRl/K3qESqgbgxsd7UTb2Hf
+          E3oMKLwpjCT6jNyxCL1wYQdWJHh1MOkzSIK/M0NkXDCAj02PaUKnmy1oFIVp9Irm
+          JTM/g+Ba0ayqi3b/Nm2/z5GfAOrAMtJfPknxupPFv3LR7jj5d2AIcHUTNFNIZu+X
+          g+qUgp0G9GygC5kYvmsmL84U4dAwzRKb0Crr/Cb6accaTtIyVcUB9E4OIwABizqi
+          Nw7EWqUtAgMBAAECggEBAJ1V9MV9vXVzcktsmgwZIKrvNFT5El6GM9Nese67vkxh
+          eyHvGQpIC2n5Il9feK6jQFzDlHZE4WQh/q0SH2BFRjSqeAMb+CaYGg66nGZgtK9z
+          5kJ2U6LYf/x31bGL2p9+utm9mCnIwSi+c1bAKEQ3XhlLq4Zw320sZ2SLwVvjWXkL
+          zMZBDywzxxoQucshN+ixgRY3h5UIjYq2WmByme3plI35taJrnjMDQkvLv4T4RZEV
+          R4ffB5GYrxh3UAXP+tl9za8SELyQKcup0op8tvUAQTVxvTZ9o58WUQRBVnXPQwVA
+          1WIjL+K8ng+8uv6eWPXWUiKpvLS0UdGs3SKESKGu7aECgYEA4zjBo8mDHx7DMBbY
+          nHkHhRExTTR8MBycQ/qSn6IYibvr0Yob6jAY/IKWqMofbMUlKRmS4xP+TUk227mB
+          U1uY6/qfcWIUOatHeHMWlZUfoDbqEghwHVcIepLziIR9SWPaj0N1waf+G4/uVWYk
+          nB7m7hqdGro+8i0BD/V5RJsMFJUCgYEAyPdumcfPB4JfArmrsg7DTVNYXuY2+nH7
+          hohQ539y/SGFRqDxEqrbSsJo/jofU0ZZECVuieE4NqmkCBohXq+nzNHpsOgXveiW
+          NOdFuurDFxM+XTH240U1Ea9J4cHy+/fkM6CWvIyB3pkAGhjYkrqRoC0M+OeSxT4C
+          zz3d6eDt0DkCgYEAz7rUtTOGT44lLjLEx5CSgmHsa8PfAXE2n6NWJuDfhBQsjH2x
+          9ZERVtDggeF/h0ZZKdD6i+V8aRXVNF3M0PN9w8d1uwfKq8pd5c15yTjzF9r8dY4H
+          SZuG4eC1Cortq4nBh5ZJ8sjttC8K2kIumBhcUTQ9ivDYmTjxrrBhtIn3Kl0CgYA2
+          L/ljf6vEA5QowPWZuj9Q70Mpu3thhjBi8wiVkxjnRg2QoL6/4M/mVYtH2VYu9w32
+          u5EVnmOw4Yb4JEuRI13kbUlMyRf1vewaca2sm7Zk12x+ZoWCfFu13ATY2Znx9MJU
+          ZV2fk2dFJQ4Q+1gSIDo57UvNJWu+wVyykqTudhbJiQKBgHQirMK38iLWMtebQIw9
+          7h+SIC3s9NjGG4zL+ZdwxINwY12CX1P9DclMc0eLwRaTLhunN41HmlXBChLxwMBy
+          ySEOGJYFGdpynhI/QUs/FGmqBCVvOou8eRWWByhRJQAJSj1t39SpxjaLKHPP/GsK
+          yu9ryqb/TXaDn8Nj1DpCOJvV
           -----END PRIVATE KEY-----
       locations: 
         front: 
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 163f5d2..46128c8 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -603,7 +603,7 @@ sources:
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: develop
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
index 39c3b0a..e0c5c79 100644
--- a/hiera/dotterel.yaml
+++ b/hiera/dotterel.yaml
@@ -32,8 +32,8 @@ mail:
     - snail.dev.bitmask.net
 name: dotterel
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: internal_service
 services: 
   - tor
@@ -52,7 +52,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index d6cb55b..d47d8a7 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -207,8 +207,8 @@ nickserver:
   domain: nicknym.dev.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: public_service
 services: 
   - webapp
@@ -227,7 +227,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/ferret.yaml b/hiera/ferret.yaml
index 5ee9e35..16d684d 100644
--- a/hiera/ferret.yaml
+++ b/hiera/ferret.yaml
@@ -36,8 +36,8 @@ mail:
     - snail.dev.bitmask.net
 name: ferret
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: internal_service
 services: 
   - backup
@@ -56,7 +56,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/gecko.yaml b/hiera/gecko.yaml
index 6d88c89..a66bc0c 100644
--- a/hiera/gecko.yaml
+++ b/hiera/gecko.yaml
@@ -80,8 +80,8 @@ mail:
     - mudskipper.cdev.bitmask.net
 name: gecko
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: public_service
 services: 
   - couchdb
@@ -109,7 +109,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index 0f26a20..bcdb3cd 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -64,8 +64,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: user_service
 services: 
   - openvpn
@@ -84,7 +84,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 7b3e9ed..c1d1e18 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -104,8 +104,8 @@ mynetworks:
   - "85.17.92.143"
 name: leech
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 rbls: 
   - zen.spamhaus.org
 service_type: user_service
@@ -126,7 +126,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
@@ -383,64 +383,64 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFTjCCBDagAwIBAgISAyZ/0mn21/5hlpfWr8/8vkiuMA0GCSqGSIb3DQEBCwUA
+      MIIFZDCCBEygAwIBAgISA78eQ6wk8YCqT9w8r5h6QRfiMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA0MTUyMDExMDBaFw0x
-      NjA3MTQyMDExMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
-      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUVDyzYl9hzmemkMiSdBZULJjLreFd
-      ctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpMXdqoQSZvgTXvGTWl
-      s2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajFitRtDRxc4UOP2Zr7
-      cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oawtgTcmS5gu5yNVyNi
-      +saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo58dJHFRRCLspVg3Hb
-      xVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys6DEmkbpLAgMBAAGj
-      ggJbMIICVzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLLY1bGw+EdNB0rxXJgvyfiy
-      DA+yMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA3MTMyMDQ4MDBaFw0x
+      NjEwMTEyMDQ4MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
+      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTogAswbQSKrLS8AZf73L+MKf1HPEu
+      zsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2DkllzldN4Felb4k7p
+      1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6XrZIu5EcpQoTyHG4R
+      V6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYCp+Lufqae4xVh7sQw
+      5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa3XvCqt+vl1x4wDTA
+      mgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3AB5SfcvjAgMBAAGj
+      ggJxMIICbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGcwIPWo3Xb+fQfuHyTJq1Vq
+      bR+/MB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
       BGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0
       Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
-      dC5vcmcvMGUGA1UdEQReMFyCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
+      dC5vcmcvMHsGA1UdEQR0MHKCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
       dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCGHdhbGxhYnkuZGVt
-      by5iaXRtYXNrLm5ldDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC
-      3xMBAQEwgdYwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3Jn
-      MIGrBggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUg
-      cmVsaWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29y
-      ZGFuY2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBz
-      Oi8vbGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IB
-      AQAigffcKH59L/3CGBSWvStKBITsY8DYA4VZpxK5k+Kabs/ZDbnWVF8+6pEMF2/C
-      +WO0MTQJHnWCI4oCNPVLaVqaOMUI2dGuc+EpjSnrWEf2osnbNM7x5mI1sHoe+vVL
-      zCFP1Ebr6S3iSiQwsZZUGEhX+8PW9dW2rVjMh/QGn/+AD9cpc2ZAeOP67F1/SLPx
-      NcQVYwOjqXf0mIZxxAMIZytwhw++PNaZjaBwaoOWGLGEnMzFVZSr10lV2yuj0xyh
-      1Axtal6l6P2u1iBa1YRxUYqawyGYc+3D+cXBjK8iJ7KwItOorDq8jGTPP2Ueal+h
-      qsywV+VNgNB8AsMUHf3Q4+8Y
+      by5iaXRtYXNrLm5ldIIUd3d3LmRlbW8uYml0bWFzay5uZXQwgf4GA1UdIASB9jCB
+      8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYGCCsGAQUFBwIBFhpodHRw
+      Oi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENl
+      cnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFy
+      dGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmljYXRl
+      IFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0
+      b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEATurnMUYbPVctxKvtYIkRJ1MCOUJqg5OM
+      ZXIqqbqBD3KfS0ylfuUbY/5WeGt+wIH3YQL5nlYG2eVbO4WdZNlVow8oo8yGwNRK
+      vkYiturL9TI02WcQ5+zmBHlTxbEdrXGfpHpCnx76Gu78ywcoSsGKjBepv04+LTt0
+      1HcUR/e6fup0r4DIIoX9UwS0zVaIJFHxe7ZzvOo5A+vSgnYONo9Alw0aK5oldnmI
+      d05hhSwqgM074mbWJKWsEEdxlUrWxvQE7LqAGO+T/koctxrnuaaeyo8js6NOgO54
+      Xg75gRgGqJcSW7WQxZzoNvRzlLHQjVWAHeKpD/p96/5BNCGxxlLCrQ==
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN PRIVATE KEY-----
-      MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUVDyzYl9hzmem
-      kMiSdBZULJjLreFdctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpM
-      XdqoQSZvgTXvGTWls2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajF
-      itRtDRxc4UOP2Zr7cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oaw
-      tgTcmS5gu5yNVyNi+saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo5
-      8dJHFRRCLspVg3HbxVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys
-      6DEmkbpLAgMBAAECggEBAL+orgYqdPifTNaAeFwiZ4lhnCa2dOhaZMflb8USMrE1
-      joH0moPQYXdWRVDzMlMrdf0w1KY1g0I0lEBss5QPAvfBxYJm2hMRY0NZ22W8/9N5
-      UN2GkcmtlPi47HndIKhk0KY1Su2L8/jHzkVKNMee/wwj1k2B2jC+j8DSCYCGChxi
-      zLbleRfjMfjW/wmZuP1K83QxpVgC76G+yC2IE2gYnNc2OvhMEt8Rxcl6JJDQj23k
-      4WEg1q3BNbP+Wtk7V2DDUZki3RomPi1ZyeXUjWQXMjrMKfy5EAcHgs+zAF6z69B3
-      AcOCFr+HKMYf5ZWDd2QpgxO3DD1UZlHnUaHWedlp+zECgYEA84IG9ROPXUhdpJ2+
-      kySVliol2RzZr7pvmwjEI3wuegE4DpwTnJQUAFbgaIUsWtJICt/b4RgslQVdxjpF
-      l6KDCumZKJR1q0xnDc+B3q/BXbNVcG76xIp6nSdmfy4gf+4eEYXdBzVzW89BkSaU
-      O49KS8Vqbyr3/FHfMbNOv4lDabkCgYEA3zi9cOPRJg7/jw6n9bbetcNnKC/lzEAd
-      JWi4LZ4BWBCM3ucaShfdNh32jhJAZanvtHJes4VQZDjPBT8PEYXKmwkYIYtMP75A
-      6c1zwAWxM8yc/zXUh6sN4bKtGvWdACdtFqBSL0iBSM4sRgVVNPwE8Y5Odigv1JKA
-      hHcbxFAXdiMCgYANiiFQ5zGFgkySpqK+E76thtJr7Aq+lqM1/5rITlNXPVIcndkJ
-      T8J88lev+BerRR30XNYhAfMYph+8sejEsaiPpsV5WCfiynDAd9VEyIj76MjLY6BV
-      5U1EB7jPQYVVF6xcVREhIXu0kyWWKIr9dM4wwF1WqRD42qSKYunyBHPXIQKBgAcc
-      n6yBFaDIyYudQ+yoLuBLoXW+UOv4/vS6KWQKrLBJlrNjWYsSx5F50ukj27lheKmf
-      GzVNAgqvZKkeITTFtnbKC2LGNV+yiA7q5M0xYTvtQPNAm8zWvlJ6htldCet/VhJq
-      eTPYc4YGS5LPiK9veBjaF9Xb4eo74KxXvyK6CoVRAoGBAPB568DcBAxwvRx66F1G
-      a5aZpmhnWs6DpVSQUFLS7iaQRztarp64t2LuadNPIs8lnO9pneW4ADGPojg/2U+m
-      5Wz1IiZ+QbXIoKLTikqMhgTWJMtNB0+JpuYu9uiyv/5W281oEBxJj8gsrH1j0CHP
-      3nlejHvVerPl+/dO1hpPZuz/
+      MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDTogAswbQSKrLS
+      8AZf73L+MKf1HPEuzsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2D
+      kllzldN4Felb4k7p1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6X
+      rZIu5EcpQoTyHG4RV6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYC
+      p+Lufqae4xVh7sQw5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa
+      3XvCqt+vl1x4wDTAmgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3
+      AB5SfcvjAgMBAAECggEBAL2q77ss8uRhLhkMErqCEC4tjymHAcRwfLOnG/ZgT6rx
+      GmTLvY/5s1TQk5GTEvEDnvs1SwT8Mv8F5tIHJHIJshdqk9TMcurxKlYV1eFhKyqV
+      M9msmGuYL19p5+GHmAH49Tz8+aur2dgc8AjB/0RVRE1/F0UhI6gZQtlViwcPf0V4
+      t3loVXNAIFuBYTtu1t1iH5DK0ML8wu2aOfwHTHFKsJ4INt0sm0thjL19iasNlsaB
+      ads7q3p1btMKXeSEYYOxVsYglJ+NSqPtpEw7E3Z6JgULl1alc2Z3ePMqkLPpSXmg
+      Mt7RtpTvC/g5M9E7ss+7i3M4pm2xjFjFyc/jexpD0UkCgYEA+VVLEdxaVhAga2XP
+      ceNkNNt7qLWFQX+nhXFR1TyZm6SE1PxSoCZa/7Km1KqSbty0Wgws2Fv1UzAqJp0n
+      yDIZwdq0u2nijAsBmEL7Epf5L/JPUSCL+Vs1hP+tiXCgv75otu8B0G/OZ6DE4Iz6
+      la1XrMn2v9offeB4Juq0XiEgatcCgYEA2UqlMDKzOOkK+0KANUoIoG/WTS4hTLFN
+      upUR+IJ9jJ2ocYMHNO49kIrbLWmL79L6wQKJbKOWk7w0xo3XD4tZW5193ui/RxH/
+      lVa/41N5dpftCBQ2H5j3zGY2tsI+tXqV/vQVDFBR4Xa+bQJvL4sf8nWywyQB2i8T
+      vqaGQXgEcdUCgYEA1s3Jr+iEFzMrivsaXgbGVNdmULGZzRT6MPewxaHAwJtbKNb9
+      JCYHLdUu73bIUyRnaFCm7ftDfli3Z67rEAlBsYYHQJL3bykoRZInFhzBvLHn7X+5
+      t6kBkcRoMElM5ARZ2IhOqtE4JIUYOFCcrgi5yQ3yO9TiXqLdQMHhhFrLv98CgYEA
+      szjtTPbUemFFLH7qTonU2bfE833T+3TWnsmru+Std1jmgVHIlPDYGKtfInLG+DV1
+      m9Li1JeNcCcxBIAjXW/bcURSeJRSiGUhAOU/eln0ekvPNvWsup0p7g50nINUw8zr
+      gRGDdtec4bFWWYVDfdxrqklH+8psOLDRwVOKst8yE00CgYEAuBjCMuz48InN+xeM
+      WXhlby6TgZBoRyTZrTACtJBYGTKUlmOwwMgXVwF3BCvDhOKaLcUXD+nQOA4zWo0R
+      zWmo1f6sQ5LWWdvujapWSDL9l7ZZdY8ZwAk4uidBk+2nx5D3ACnh6xmr4b28VqKz
+      wbakjQdJc37xZwm2AxiBA8tBv0E=
       -----END PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 8e86bb8..adfc9fd 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -66,8 +66,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: user_service
 services: 
   - openvpn
@@ -86,7 +86,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml
index 8fcd3a5..d0905c7 100644
--- a/hiera/mudskipper.yaml
+++ b/hiera/mudskipper.yaml
@@ -219,8 +219,8 @@ nickserver:
   domain: nicknym.cdev.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 rbls: 
   - zen.spamhaus.org
 service_type: public_service
@@ -242,7 +242,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 0545d4d..81f4079 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -66,8 +66,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: user_service
 services: 
   - openvpn
@@ -87,7 +87,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 2dc96de..5229c13 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -139,8 +139,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 rbls: 
   - zen.spamhaus.org
 service_type: user_service
@@ -162,7 +162,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 921a818..f562a2d 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -236,8 +236,8 @@ nickserver:
   domain: nicknym.demo.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.9"
+  version: "0.9"
 service_type: public_service
 services: 
   - webapp
@@ -256,7 +256,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.8"
+      basic: "http://deb.leap.se/0.9"
   soledad: 
     package: soledad-server
     revision: latest
@@ -613,64 +613,64 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFTjCCBDagAwIBAgISAyZ/0mn21/5hlpfWr8/8vkiuMA0GCSqGSIb3DQEBCwUA
+      MIIFZDCCBEygAwIBAgISA78eQ6wk8YCqT9w8r5h6QRfiMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA0MTUyMDExMDBaFw0x
-      NjA3MTQyMDExMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
-      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUVDyzYl9hzmemkMiSdBZULJjLreFd
-      ctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpMXdqoQSZvgTXvGTWl
-      s2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajFitRtDRxc4UOP2Zr7
-      cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oawtgTcmS5gu5yNVyNi
-      +saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo58dJHFRRCLspVg3Hb
-      xVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys6DEmkbpLAgMBAAGj
-      ggJbMIICVzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLLY1bGw+EdNB0rxXJgvyfiy
-      DA+yMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA3MTMyMDQ4MDBaFw0x
+      NjEwMTEyMDQ4MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggEiMA0G
+      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTogAswbQSKrLS8AZf73L+MKf1HPEu
+      zsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2DkllzldN4Felb4k7p
+      1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6XrZIu5EcpQoTyHG4R
+      V6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYCp+Lufqae4xVh7sQw
+      5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa3XvCqt+vl1x4wDTA
+      mgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3AB5SfcvjAgMBAAGj
+      ggJxMIICbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+      AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGcwIPWo3Xb+fQfuHyTJq1Vq
+      bR+/MB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMHAGCCsGAQUFBwEB
       BGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0
       Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlw
-      dC5vcmcvMGUGA1UdEQReMFyCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
+      dC5vcmcvMHsGA1UdEQR0MHKCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1vLmJp
       dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSCGHdhbGxhYnkuZGVt
-      by5iaXRtYXNrLm5ldDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC
-      3xMBAQEwgdYwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3Jn
-      MIGrBggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUg
-      cmVsaWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29y
-      ZGFuY2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBz
-      Oi8vbGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IB
-      AQAigffcKH59L/3CGBSWvStKBITsY8DYA4VZpxK5k+Kabs/ZDbnWVF8+6pEMF2/C
-      +WO0MTQJHnWCI4oCNPVLaVqaOMUI2dGuc+EpjSnrWEf2osnbNM7x5mI1sHoe+vVL
-      zCFP1Ebr6S3iSiQwsZZUGEhX+8PW9dW2rVjMh/QGn/+AD9cpc2ZAeOP67F1/SLPx
-      NcQVYwOjqXf0mIZxxAMIZytwhw++PNaZjaBwaoOWGLGEnMzFVZSr10lV2yuj0xyh
-      1Axtal6l6P2u1iBa1YRxUYqawyGYc+3D+cXBjK8iJ7KwItOorDq8jGTPP2Ueal+h
-      qsywV+VNgNB8AsMUHf3Q4+8Y
+      by5iaXRtYXNrLm5ldIIUd3d3LmRlbW8uYml0bWFzay5uZXQwgf4GA1UdIASB9jCB
+      8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYGCCsGAQUFBwIBFhpodHRw
+      Oi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENl
+      cnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFy
+      dGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmljYXRl
+      IFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0
+      b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEATurnMUYbPVctxKvtYIkRJ1MCOUJqg5OM
+      ZXIqqbqBD3KfS0ylfuUbY/5WeGt+wIH3YQL5nlYG2eVbO4WdZNlVow8oo8yGwNRK
+      vkYiturL9TI02WcQ5+zmBHlTxbEdrXGfpHpCnx76Gu78ywcoSsGKjBepv04+LTt0
+      1HcUR/e6fup0r4DIIoX9UwS0zVaIJFHxe7ZzvOo5A+vSgnYONo9Alw0aK5oldnmI
+      d05hhSwqgM074mbWJKWsEEdxlUrWxvQE7LqAGO+T/koctxrnuaaeyo8js6NOgO54
+      Xg75gRgGqJcSW7WQxZzoNvRzlLHQjVWAHeKpD/p96/5BNCGxxlLCrQ==
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN PRIVATE KEY-----
-      MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDUVDyzYl9hzmem
-      kMiSdBZULJjLreFdctoAc3SUcM6x0RSTMwS/wQPR5xXUJc025JuZ6yiBWUTe1EpM
-      XdqoQSZvgTXvGTWls2NQcrlykkipBL1zlqqdpZxUweAwGACcyCiWYRZa4XERIajF
-      itRtDRxc4UOP2Zr7cBIRntvAUKQJ8mnaIQ/0g3K2AXIulSuBU2tzKE/CdwhD4oaw
-      tgTcmS5gu5yNVyNi+saa/Yeikqp4EsmiM41IXuiJD+L7uPK5jsqJ6d9Jn3bY7Lo5
-      8dJHFRRCLspVg3HbxVbKAOhiHhvkWAUnuFRsZyzSvxH1Jv48oaTsW121PGv/nRys
-      6DEmkbpLAgMBAAECggEBAL+orgYqdPifTNaAeFwiZ4lhnCa2dOhaZMflb8USMrE1
-      joH0moPQYXdWRVDzMlMrdf0w1KY1g0I0lEBss5QPAvfBxYJm2hMRY0NZ22W8/9N5
-      UN2GkcmtlPi47HndIKhk0KY1Su2L8/jHzkVKNMee/wwj1k2B2jC+j8DSCYCGChxi
-      zLbleRfjMfjW/wmZuP1K83QxpVgC76G+yC2IE2gYnNc2OvhMEt8Rxcl6JJDQj23k
-      4WEg1q3BNbP+Wtk7V2DDUZki3RomPi1ZyeXUjWQXMjrMKfy5EAcHgs+zAF6z69B3
-      AcOCFr+HKMYf5ZWDd2QpgxO3DD1UZlHnUaHWedlp+zECgYEA84IG9ROPXUhdpJ2+
-      kySVliol2RzZr7pvmwjEI3wuegE4DpwTnJQUAFbgaIUsWtJICt/b4RgslQVdxjpF
-      l6KDCumZKJR1q0xnDc+B3q/BXbNVcG76xIp6nSdmfy4gf+4eEYXdBzVzW89BkSaU
-      O49KS8Vqbyr3/FHfMbNOv4lDabkCgYEA3zi9cOPRJg7/jw6n9bbetcNnKC/lzEAd
-      JWi4LZ4BWBCM3ucaShfdNh32jhJAZanvtHJes4VQZDjPBT8PEYXKmwkYIYtMP75A
-      6c1zwAWxM8yc/zXUh6sN4bKtGvWdACdtFqBSL0iBSM4sRgVVNPwE8Y5Odigv1JKA
-      hHcbxFAXdiMCgYANiiFQ5zGFgkySpqK+E76thtJr7Aq+lqM1/5rITlNXPVIcndkJ
-      T8J88lev+BerRR30XNYhAfMYph+8sejEsaiPpsV5WCfiynDAd9VEyIj76MjLY6BV
-      5U1EB7jPQYVVF6xcVREhIXu0kyWWKIr9dM4wwF1WqRD42qSKYunyBHPXIQKBgAcc
-      n6yBFaDIyYudQ+yoLuBLoXW+UOv4/vS6KWQKrLBJlrNjWYsSx5F50ukj27lheKmf
-      GzVNAgqvZKkeITTFtnbKC2LGNV+yiA7q5M0xYTvtQPNAm8zWvlJ6htldCet/VhJq
-      eTPYc4YGS5LPiK9veBjaF9Xb4eo74KxXvyK6CoVRAoGBAPB568DcBAxwvRx66F1G
-      a5aZpmhnWs6DpVSQUFLS7iaQRztarp64t2LuadNPIs8lnO9pneW4ADGPojg/2U+m
-      5Wz1IiZ+QbXIoKLTikqMhgTWJMtNB0+JpuYu9uiyv/5W281oEBxJj8gsrH1j0CHP
-      3nlejHvVerPl+/dO1hpPZuz/
+      MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDTogAswbQSKrLS
+      8AZf73L+MKf1HPEuzsQt68QRS8PZPz6BcyZ9PFLksXb8J3kucWIwWuT3DqPsCq2D
+      kllzldN4Felb4k7p1ktNzi53sMxzQmVU5MOGm6g3hCTjbWb12mZNyuF4moa5EV6X
+      rZIu5EcpQoTyHG4RV6RFuKJv+36kZzlytXpWzT3rgRorFNFxgF0ZDNlnvBPfzEYC
+      p+Lufqae4xVh7sQw5BtFD/wKSownuVLgQaM3v+5whe5PNAapBlqI9BmZAC36JoKa
+      3XvCqt+vl1x4wDTAmgSUyIIKjCVNv76asRrRtzRfV7wn/J6CfYCnqYTVYKtv4CZ3
+      AB5SfcvjAgMBAAECggEBAL2q77ss8uRhLhkMErqCEC4tjymHAcRwfLOnG/ZgT6rx
+      GmTLvY/5s1TQk5GTEvEDnvs1SwT8Mv8F5tIHJHIJshdqk9TMcurxKlYV1eFhKyqV
+      M9msmGuYL19p5+GHmAH49Tz8+aur2dgc8AjB/0RVRE1/F0UhI6gZQtlViwcPf0V4
+      t3loVXNAIFuBYTtu1t1iH5DK0ML8wu2aOfwHTHFKsJ4INt0sm0thjL19iasNlsaB
+      ads7q3p1btMKXeSEYYOxVsYglJ+NSqPtpEw7E3Z6JgULl1alc2Z3ePMqkLPpSXmg
+      Mt7RtpTvC/g5M9E7ss+7i3M4pm2xjFjFyc/jexpD0UkCgYEA+VVLEdxaVhAga2XP
+      ceNkNNt7qLWFQX+nhXFR1TyZm6SE1PxSoCZa/7Km1KqSbty0Wgws2Fv1UzAqJp0n
+      yDIZwdq0u2nijAsBmEL7Epf5L/JPUSCL+Vs1hP+tiXCgv75otu8B0G/OZ6DE4Iz6
+      la1XrMn2v9offeB4Juq0XiEgatcCgYEA2UqlMDKzOOkK+0KANUoIoG/WTS4hTLFN
+      upUR+IJ9jJ2ocYMHNO49kIrbLWmL79L6wQKJbKOWk7w0xo3XD4tZW5193ui/RxH/
+      lVa/41N5dpftCBQ2H5j3zGY2tsI+tXqV/vQVDFBR4Xa+bQJvL4sf8nWywyQB2i8T
+      vqaGQXgEcdUCgYEA1s3Jr+iEFzMrivsaXgbGVNdmULGZzRT6MPewxaHAwJtbKNb9
+      JCYHLdUu73bIUyRnaFCm7ftDfli3Z67rEAlBsYYHQJL3bykoRZInFhzBvLHn7X+5
+      t6kBkcRoMElM5ARZ2IhOqtE4JIUYOFCcrgi5yQ3yO9TiXqLdQMHhhFrLv98CgYEA
+      szjtTPbUemFFLH7qTonU2bfE833T+3TWnsmru+Std1jmgVHIlPDYGKtfInLG+DV1
+      m9Li1JeNcCcxBIAjXW/bcURSeJRSiGUhAOU/eln0ekvPNvWsup0p7g50nINUw8zr
+      gRGDdtec4bFWWYVDfdxrqklH+8psOLDRwVOKst8yE00CgYEAuBjCMuz48InN+xeM
+      WXhlby6TgZBoRyTZrTACtJBYGTKUlmOwwMgXVwF3BCvDhOKaLcUXD+nQOA4zWo0R
+      zWmo1f6sQ5LWWdvujapWSDL9l7ZZdY8ZwAk4uidBk+2nx5D3ACnh6xmr4b28VqKz
+      wbakjQdJc37xZwm2AxiBA8tBv0E=
       -----END PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/nodes/donkey.json b/nodes/donkey.json
index f6be6cc..4ad76dd 100644
--- a/nodes/donkey.json
+++ b/nodes/donkey.json
@@ -9,5 +9,10 @@
     "dc",
     "sandbox-braintree",
     "unstable"
-  ]
+  ],
+  "sources": {
+    "webapp": {
+      "revision": "develop"
+    }
+  }
 }
diff --git a/secrets.json b/secrets.json
index f64a06b..95e25f1 100644
--- a/secrets.json
+++ b/secrets.json
@@ -62,6 +62,24 @@
     "scramblesuit_password_hippo": "GZ5FI5KQJUZVSTTYOI3XESDNOVEXQR2K",
     "scramblesuit_port_hippo": 28975
   },
+  "local": {
+    "api_monitor_auth_token": "sUbdbjXH9JCPYsHhrcmN7nIeV4dvz2p9",
+    "couch_admin_password": "9BCx7uNIZZpAbFMEDcDRSf5vsaLFFTm8",
+    "couch_admin_password_salt": "d516980ae7723063527215ce87cf10e4",
+    "couch_leap_mx_password": "u5DqWfFxILQ8qACWwjXzJAqshUjYwhkb",
+    "couch_leap_mx_password_salt": "a65f0dacd86d0e031a03f70ea6cc1115",
+    "couch_nickserver_password": "KnMpkceeZJTHV5Bq9pNEVUKgqvBFtPxW",
+    "couch_nickserver_password_salt": "0d8b5ed6df530a076fe2a064c3165ceb",
+    "couch_replication_password": "fDkhPYvVnAxFbVMKmVIF7x5dy3mKVDeU",
+    "couch_replication_password_salt": "27fdcca1c922b4eb060f545f4af06032",
+    "couch_soledad_password": "V3ySsqScEIJuJASvkBTZrFgvz8nuqwak",
+    "couch_soledad_password_salt": "8c9fbedea349a270effc6b96c0ef8e45",
+    "couch_webapp_password": "YdwLxPJAs4ZtyBLHYFu5Q2jdxBpyBEN8",
+    "couch_webapp_password_salt": "83710c0498f8c3cb12c56f8ee726700d",
+    "nagios_admin_password": "WcFpHgWyTtZWrfpIDwy3vYD9AryNHRak",
+    "nagios_test_password": "PR9gHpCQyRIzaEtsBkga5FhN4aKzsffm",
+    "webapp_secret_token": "Cqc8JFLsI92pAcBWkRWT7JFmPFr7RXZn"
+  },
   "mail": {
     "api_monitor_auth_token": "vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2",
     "couch_admin_password": "5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw",