update host keys for reset dev servers; add new secrets for couch replication and scramblesuit, and other hiera options that were updated

1 files changed, 94 insertions, 80 deletions

diff --git a/hiera/web1.yaml b/hiera/web1.yaml
index bba764a..54b2f51 100644
--- a/hiera/web1.yaml
+++ b/hiera/web1.yaml
@@ -62,7 +62,7 @@ definition_files:
           "es"
         ],
         "name": {
-          "en": "Test Bitmask"
+          "en": "Bitmask"
         },
         "service": {
           "allow_anonymous": false,
@@ -124,10 +124,10 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - web1.bitmask.net
-    - bitmask.net
     - api.bitmask.net
+    - bitmask.net
     - nicknym.bitmask.net
+    - web1.bitmask.net
   public: true
 domain: 
   full: web1.bitmask.net
@@ -138,17 +138,21 @@ domain:
 enabled: true
 environment: local
 haproxy: 
-  servers: 
-    couch1: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 10
-    couch2: 
-      backup: false
-      host: localhost
-      port: 4001
-      weight: 10
+  couch: 
+    listen_port: 4096
+    servers: 
+      couch1: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 10
+        writable: true
+      couch2: 
+        backup: false
+        host: localhost
+        port: 4001
+        weight: 10
+        writable: true
 hosts: 
   couch1: 
     domain_full: couch1.bitmask.net
@@ -175,6 +179,9 @@ nickserver:
     username: nickserver
   domain: nicknym.bitmask.net
   port: 6425
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: public_service
 services: 
   - webapp
@@ -216,28 +223,33 @@ ssh:
     ports: "60000:61000"
   port: 22
 stunnel: 
-  couch_client: 
-    couch1_5984: 
-      accept_port: 4000
-      connect: couch1.bitmask.i
-      connect_port: 15984
-    couch2_5984: 
-      accept_port: 4001
-      connect: couch2.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      couch1_5984: 
+        accept_port: 4000
+        connect: couch1.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      couch2_5984: 
+        accept_port: 4001
+        connect: couch2.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - local
 webapp: 
   admins: 
+    - azul
     - elijah
-    - varac
-    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - azul
+    - micah
+    - varac
   allow_anonymous_certs: false
   allow_limited_certs: false
+  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   client_certificates: 
@@ -253,16 +265,18 @@ webapp:
     password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9
     salt: 7e8868f8c4775290fd37d2f520d13672
     username: webapp
-  customization_dir: /etc/leap/files/webapp/
+  customization_dir: /srv/leap/files/files/webapp/
   default_service_level: 1
   domain: bitmask.net
+  engines: 
+    - support
   git: 
     revision: origin/master
     source: "https://leap.se/git/leap_web"
   modules: 
-    - user
     - billing
     - help
+    - user
   nagios_test_user: 
     password: uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT
     username: nagios_test
@@ -309,33 +323,32 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIE4jCCAsqgAwIBAgIQWvEjyB3Gj+kZd6PqYRc8tTANBgkqhkiG9w0BAQsFADBK
-      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw
-      NDA4MDAwMDAwWjAbMRkwFwYDVQQDDBB3ZWIxLmJpdG1hc2submV0MIIBIjANBgkq
-      hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyvfMJUiE9DSzZIxqRMEYlcVqfSHxoN/p
-      Z7VUuH8nBzUnpfKS/K1hq7OcOer7+uuC8ptxQWIvedvGVziyTtq/gI+TOWNwjvZp
-      zLCb1bjZGVcLIWt3CIDeDZ0DjSVaJg2EQFxKd46AxDIbbTDlE+cAsSjyKv7Fa85w
-      a55vJPt5XjBunY7xiPSGsjZC3/I+yxbp5qhwMTB0eJSlSBUHoksaTcmVPi5fxdg4
-      LlI8pcEFG2LcAQFh8lqIoq+CKfi8TNvQVWPgD3HFlVzfLUZHljyRjwPWUxskNiO4
-      Yacr/mE2LOFlq2iqGEzBlUUkMp3KOgDT6htHUsojQRZVzeHwn/A33QIDAQABo4Hy
-      MIHvMB0GA1UdDgQWBBQXjstrt4d+nktZDAUH+IVGD+ytSjB2BgNVHREEbzBtgg53
-      ZWIxLmJpdG1hc2suaYIQd2ViMS5iaXRtYXNrLm5ldIILYml0bWFzay5uZXSCEHdl
-      YjEuYml0bWFzay5uZXSCD2FwaS5iaXRtYXNrLm5ldIITbmlja255bS5iaXRtYXNr
-      Lm5ldIcECgUFLzALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-      AQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+
-      D48wDQYJKoZIhvcNAQELBQADggIBAD7r5xzPdT7lmnqZz4RAy14EbEWp9aZ+tWjh
-      Afu+uCtCW6/mpgcP1fe9IjaM4bKZ/fERPSqroz9ljn8MGz9TtkJW/JSS52GcVoZi
-      RN24WqlzrY3Aq0mO5165A7m/Sg/toQTtzRZVyzaVqL5HMrxHgAoiEP9dybjpPDaT
-      rJeJ5zPM3BnlMwDHP6O4hgoHbtv4GfFb26jVjBaGKQJ/vdtVgBzf+2Lu5Hq0TOCW
-      vTVf62pWavthGlpaq3n57ZHw2vimUCao5/mRJPVwk1VGXaZOTm/WqN7x9gAJoMhm
-      SVxNhl+ZW6N65rDFm4MzCIRHDJHAHXHm/DJ0YCiBK8JNHmF+OEyU94WPxhWpTftc
-      EfESEB4BfqzEWMrR8WF3O5MmEspBJIU7zg7Hg+l0qteN5TS38K/xuHufkthrndfU
-      OiPjd4HFJaIfs/Bprv2pNAbcwE34CdFRg9kz/frWECsB57PuGff4TigHzeOD5eP6
-      u38uVj+ShgLhEZ2X7CywviJzvb7NVh3hVLVjAJ5/bu1d/IS6Lhvw7I/zs4QOT9bJ
-      1iDzQa8Y3uBczxiMemCe0OPftvyHManuXu9sDgvJZsDO95dJFmUvKwTGPsIil+ez
-      rM+MPo/6YXL5hmBlLGxXOqdIqrPeSTiQbEehw43vdkN6I83KOWlnJ5OEI0hyyQxT
-      0/nw8amp
+      MIIE0TCCArmgAwIBAgIRAJ3OtRC5FbPT5E/EjMpdDtwwDQYJKoZIhvcNAQELBQAw
+      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MTAwMjAwMDAwMFoXDTE1
+      MTAwMjAwMDAwMFowGzEZMBcGA1UEAwwQd2ViMS5iaXRtYXNrLm5ldDCCASIwDQYJ
+      KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/4QKBE/8Mv2mTx1zNndSedAMYqASTf
+      wv6XNwSbupZMkPAjdnrM9fZaQ4i4MUB+MoM3KT+mZEeH3YuVNUsFpeCjaperhdvW
+      IWznt5NQd3zrv3Oy3JUwidYzECUkpWtu/UILlJ8EdjmT8668QgkhnUjk+2gnd6gl
+      agZ6YkdRBSP5NruVTDhGCSUbOKCSTxbBadcmIro2y23jHuc8iVPQGqTPfLg/4EZ3
+      39Tlqr8Ht4BZ+WDOJNAQ3rNCH9Ndr9nvpz99GM5nS4VSBIyPRnohGsBhaX8+nh2K
+      38n0AWiEcRhgTMvDfOrNMRt69XbQKKAi8fLhZUS7SoSWO/HE7mKAvYsCAwEAAaOB
+      4DCB3TAdBgNVHQ4EFgQUjmFGqQTALWMr25NHFJhWXsyQUFswZAYDVR0RBF0wW4IP
+      YXBpLmJpdG1hc2submV0ggtiaXRtYXNrLm5ldIITbmlja255bS5iaXRtYXNrLm5l
+      dIIOd2ViMS5iaXRtYXNrLmmCEHdlYjEuYml0bWFzay5uZXSHBAoFBS8wCwYDVR0P
+      BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAA
+      MB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUA
+      A4ICAQBXnrM9f+/+WtqK6QSekUu3fYXPXNTfmE4QyYeaNvoLhEAxXY+KGRJ7Kryp
+      UDODQ8D9ieX0f4YQ9hrm1+eg5mkxc3vyieb2E21A2Eyo7odbq+g2Bve4R4oWMEL+
+      wEEwhLC307PjA3i4eyBa3ZDi6n2STS9eTIvBd7eVrgSsZluShoSpvBv2rft6jRem
+      NKKhhKfmDT/Vq63yEqy6K9Vhamm1zaFwdgSlyM2sNA1d0nYga9ikrTNRhIjBDRdE
+      gY9G2x2HszflrVpLPB2SCaAlXp3dGLWMisuXKQkMtQLQ+/UfdifAF9D3d6iCyUTG
+      KzmsNpZJiK0yEnz4Snd5RVlDe9TW/Qcydt2OmYUjkveutBw79m/AUi/pSC+Nr7pg
+      Ka6ER5DYORuqgDEZMsyO04Z0faMZDSn3iM51mqB15agpN1E5pLFQZOyHsYwZbeEM
+      D5VwlmFSKKCzjQr6zV4O3XJRflewlCuLrJy1WJfZlpvkd78+EyvWfafuJmSl8P/P
+      acsZ//8P/DIeBf7HS7qsyP6fBOLTWDogOllnBnM05GJqx2Lbks6UzBil8yqLmUap
+      oSyB6k3ZK8fyruETD6sBe5pYhB01VbZaeZj78SS4pgh2XJ+NVQJg4Sl4u8x/wohC
+      ykld76BRUwy2eUKt3pzx6CtwHCL1wsSJIoO+q8fjqSg3YgtnOA==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -670,30 +683,31 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true