New certs for dev.bm

1 files changed, 63 insertions, 40 deletions

diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index dea0ad8..9e29ca0 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -165,16 +165,6 @@ firewall:
       - 6425
       - 80
     to: "37.218.242.214"
-haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      clam: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
 hosts: 
   clam: 
     domain_full: clam.dev.bitmask.net
@@ -226,7 +216,8 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-platform"
+      basic: "http://deb.leap.se/platform"
+      component: snapshots
   soledad: 
     package: soledad-server
     revision: latest
@@ -343,6 +334,7 @@ webapp:
     password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH
     salt: 51d3c78980b9cf319cadbc73896f7128
     username: admin
+  couchdb_port: 4000
   couchdb_webapp_user: 
     password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY
     salt: 86497f034c8ef09b097f5c757ab038b7
@@ -595,35 +587,66 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      AjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24g
+      YnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0
+      aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5
+      cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAdUO34H/r+DBY9
+      HXXGtMVP0Hc3DcyGu4pvyBNCpW3MZk2+bvN37oYtw1MDE16crpawx6RxovtnQcQk
+      dnr33oe1z5Rn70Fe/VF5bWYEtizUR6YxeEhgP6S7sUdL1Rp1fBI0M4OhObJ+9fQj
+      W5OJDq3Hn2/gbucVUWendEz5pikKkMlj0TTJdy/e3q5ZOMh8zYnSxabTstzfrQJ6
+      1wnlxnJRc4hOnWEafeOBSkcrYkywoUsdhvsmRlQAmh4IRNmloWBy9FN6IXwQ+clH
+      EHBxs/AHViMpkw6GfYk5Lp0acbfxii9ayYAPWtl+rtjKRXrJUTHjdDV5vYDSE2u8
+      mPx2EanW
+      -----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-----