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, 93 insertions, 79 deletions

diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 63ecf90..d5cb95d 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -161,10 +161,10 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - wallaby.demo.bitmask.net
-    - demo.bitmask.net
     - api.demo.bitmask.net
+    - demo.bitmask.net
     - nicknym.demo.bitmask.net
+    - wallaby.demo.bitmask.net
   public: true
 domain: 
   full: wallaby.demo.bitmask.net
@@ -175,17 +175,21 @@ domain:
 enabled: true
 environment: demo
 haproxy: 
-  servers: 
-    ant: 
-      backup: false
-      host: localhost
-      port: 4001
-      weight: 100
-    thrips: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      ant: 
+        backup: false
+        host: localhost
+        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
@@ -219,6 +223,9 @@ nickserver:
     username: nickserver
   domain: nicknym.demo.bitmask.net
   port: 6425
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: public_service
 services: 
   - webapp
@@ -259,29 +266,34 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_client: 
-    ant_5984: 
-      accept_port: 4001
-      connect: ant.demo.bitmask.i
-      connect_port: 15984
-    thrips_5984: 
-      accept_port: 4000
-      connect: thrips.demo.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      ant_5984: 
+        accept_port: 4000
+        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
   - seattle
 webapp: 
   admins: 
+    - azul
     - elijah
-    - varac
-    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - azul
+    - micah
+    - varac
   allow_anonymous_certs: true
   allow_limited_certs: false
+  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   client_certificates: 
@@ -297,16 +309,18 @@ webapp:
     password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg
     salt: c632af58769857bcdf108b46da9eaa44
     username: webapp
-  customization_dir: /etc/leap/files/webapp/
+  customization_dir: /srv/leap/files/files/webapp/
   default_service_level: 1
   domain: demo.bitmask.net
+  engines: 
+    - support
   git: 
     revision: origin/master
     source: "https://leap.se/git/leap_web"
   modules: 
-    - user
     - billing
     - help
+    - user
   nagios_test_user: 
     password: CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv
     username: nagios_test
@@ -353,34 +367,33 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFFjCCAv6gAwIBAgIQJFnZv7aOMD6xKQB/IO9N/TANBgkqhkiG9w0BAQsFADBK
+      MIIE+TCCAuGgAwIBAgIQf2VP0SlAHk2CKiWJEkUgzDANBgkqhkiG9w0BAQsFADBK
       MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw
-      NDA4MDAwMDAwWjAjMSEwHwYDVQQDDBh3YWxsYWJ5LmRlbW8uYml0bWFzay5uZXQw
-      ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB+UJJ5KZ4LzG0mDOXHtLt
-      DOsL9zKsCEusUSAyejaBUABDIZsf7uRehDdmZ+9T7eJ4smIQPkTihhG7rSmqKD1K
-      mzMVZzPvvGHajOV9VoUeqHJAAapKVTD2EYwwQDHD0+2jsrd3YoF9ZC/X/Oh99MK9
-      K4tH6j3GcP8ZP3300k4NTyMTbNHhbAubSUQm8zclB3Kx89fGaqUIYHwdwcJ72ilO
-      4at7wXgiZNTua4Zkao29SGbgILQ5KHfX1KtgcBQpkP3p1hpXpBYHa5gNh0bFTW+T
-      eZ9suecFXnhjbTi5F4y/sFR/G4EPnraKqpQQjyypfQMwatu6dYVnnNCUFerYnPl7
-      AgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUCMTzhaODlorLq9W6q1JwpzLAtkYwgZ8G
-      A1UdEQSBlzCBlIIWd2FsbGFieS5kZW1vLmJpdG1hc2suaYIYd2FsbGFieS5kZW1v
-      LmJpdG1hc2submV0ghBkZW1vLmJpdG1hc2submV0ghh3YWxsYWJ5LmRlbW8uYml0
-      bWFzay5uZXSCFGFwaS5kZW1vLmJpdG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0
-      bWFzay5uZXSHBMwNpDkwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-      BggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66
-      LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCTSj6dJAuSc4eZM/yIEAyp9trKuVFZ
-      5oF6/zuqP4jIcbHA/W5WI4uxIx8GS9aJ8dkuvwfZRgQsn8alT8zcMmXZwrOB3J2m
-      jsa8FDuBz6f/+qKAtT24dZrbY6DDeGx3ChwPWxltygI1TWN36V7yFoWMIdXaVIzs
-      uZfIBKGajXQAWun0BP8TNgLnkrFU9uC36VWGuigIW9yf0ldyPIlf2+bktPjm84Rw
-      9uZidBYMwT8oJbsf5B1k3FzY5sblVyXy1LS5gjwdqsd1gFjnepNNRT7HwpQkffk/
-      4cA+OQVD3f80kaZHhwLHY/6203qYXcj0VEfQ5Wv9BhmzFtYZ52WYvPEDfjhyntLl
-      40rE7GvamJTEWYX8sNpKTE9LqSOPleYqIl5SypLrNXONMIVWPr3NGbd/WoXzD1xs
-      NpcCrBHoqV1KQfp/N66iRYZ9IT/6zcu5IpjZRKPDbNl7gdTgG8WBumM7R/n+7Ih2
-      8Nq2bXCLbD+TG1uGljtgwBSfmf8l8C61c3EFsEZqKgsGNi/aN/7KbdJl2Kvw2Fc2
-      vPVjAIc4LrpCHj7mXRu8BuBvPG1Ac6sDyuUvfvMwZgJCk42c2tw0S5bKgTajlyyz
-      vorgE3EJ+03yp7IR+H8kZCjrOqE0PIdyopdkIZUQioTSX0EpvNk2rrhKolSGmwQC
-      +sx0F/msFOO4uQ==
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
+      MDAyMDAwMDAwWjAjMSEwHwYDVQQDDBh3YWxsYWJ5LmRlbW8uYml0bWFzay5uZXQw
+      ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaHUiJ2xSUJtgskA/wOIpV
+      ozH409bwONt+f/7ldLzT6x6vZmwiuLFhcT7/WoD+WS/6EDETva93qYyX7N5m0eWH
+      NA9GCcHZjgMlOg57JxN0UXg8Vdtl2DFQxPtZL8JOxT4nvnwF+HcNXuV6V+UA4cPv
+      GDbXO9i8STMzNOWDhJb+uX+CYl6YJOK5xmdqLWKEx5NIQH9ItyBjzzEJJZnMP/c7
+      OwUzVI9y8waZyU5XB/lLfHwf5rsTdQRQZwp2CKBWuoXFE+OgVWAMPQNsPpVN7sYs
+      fLWeOc1M2UnEIs8SClxRpoJ1HcJrYrlo9P1LdPgSr33ArBKLumDXIkRbO6RGmsdz
+      AgMBAAGjggEAMIH9MB0GA1UdDgQWBBSbB8TAs9lDKMHycs9OTbAYqglVITCBgwYD
+      VR0RBHwweoIUYXBpLmRlbW8uYml0bWFzay5uZXSCEGRlbW8uYml0bWFzay5uZXSC
+      GG5pY2tueW0uZGVtby5iaXRtYXNrLm5ldIIWd2FsbGFieS5kZW1vLmJpdG1hc2su
+      aYIYd2FsbGFieS5kZW1vLmJpdG1hc2submV0hwTMDaQ5MAsGA1UdDwQEAwIFoDAd
+      BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSME
+      GDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEARatb
+      HElC+JqqelaPmcVFaftBgRgeCKq2eisN1SSaX8/DNhGycDbLuyLiFHINimYM296x
+      l3tMNhVureGHRTlG3qciWj6B5hk7WIPPWEAFozZ0sgOR19lwh3TMxn+wPLs+HrtB
+      sz9YysESzBQHh70UqsINHEdIvHq0gtuin20qDt+OTm3srUg/YF2JyVyJLTGplyLt
+      LUv0jiobK/O3sVipC3vurOaGhyDkJHxEOIyJpE9e7hC6gHjz0wcpvPanrcPn+79y
+      IPRs8OSR8Viph34j6fjP62b/6NK/Uk8Ew3WAZyrhwzSDcFAXNdWDn95x9ZSSViQ+
+      ZflMA781jx5TgRKd60vmeJSqBpR4a2RlfIKjWQzMMCsa15fcFiIgwQ2GmFLWuIll
+      qP0MsSNzlhwwN6gE+Zr8cA8TR/r3z95i1cKfpXkDL8Cl9+1qhGoq66FxUi4ukRMM
+      dABQ0miH0/MiF0i5RtcPjA6vHRkOqKrZNz+7iWsdEZNb+w2tmiKxrR17ggoENFeR
+      M6sIqTi57+vPvFdHUfRHGiIPdR83AyEBn2i2q2PNgux+Ss+J25g6y6yYRkrTLQb6
+      CvXR4MxjjbVcfOf3djpy8+5nmgkv31m86tHrVsWeNnoIXcqZ6XQ3aD7N7GJGInEm
+      uzFIj3FWWrQiO7OkvvEgq/1ypkrjX18jDBkvTL0=
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -715,30 +728,31 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      MIIEpAIBAAKCAQEA2h1IidsUlCbYLJAP8DiKVaMx+NPW8Djbfn/+5XS80+ser2Zs
+      IrixYXE+/1qA/lkv+hAxE72vd6mMl+zeZtHlhzQPRgnB2Y4DJToOeycTdFF4PFXb
+      ZdgxUMT7WS/CTsU+J758Bfh3DV7lelflAOHD7xg21zvYvEkzMzTlg4SW/rl/gmJe
+      mCTiucZnai1ihMeTSEB/SLcgY88xCSWZzD/3OzsFM1SPcvMGmclOVwf5S3x8H+a7
+      E3UEUGcKdgigVrqFxRPjoFVgDD0DbD6VTe7GLHy1njnNTNlJxCLPEgpcUaaCdR3C
+      a2K5aPT9S3T4Eq99wKwSi7pg1yJEWzukRprHcwIDAQABAoIBAQCE9UDYuDHNNfil
+      AZSVrQG2vmqh8hCeEyrJ7CBno0fQLw1fgqH8cHXAnpX2dycW5Ss31lL0Y7bozPQl
+      UIEqUF0IlBWTbjM6+TS1prRZIjLbvyX6MaQyax10zP8jGNfryJThCV71DMcV4Xkl
+      oRq59OXJhAs6HQM7k6ugVWhrSZH559zxfL69DvtnYXf6HPunufWNsTxP10RLET4X
+      nUeg8ZoF1Qpag7xVctZf1GwNFhoP9oW/x5YHapx8FpJyDwpwEaw43jjcMr19ML/2
+      Ko5Tf9yKxsMJ8LCfj37SZk0Np/rTBmxuklrYCHSpYRwKClN6TwVbXFepGTInXb+z
+      QV4ifndRAoGBAP/LsdMzdkGcau259XIiL/LGLPevZzVfqfuy99dreNCtBjIuW/OK
+      IJOeozSjuZjpqTMcWZ/8Vzcm7CnUa5GPjyLI1p1zq9KVLNDArXcYapRL8RN0Tbwi
+      mzQgXVwzsBJ3nZVocsfSmXOVAIe8X3hRuQtDWOXebuzl/lSE51JH24F3AoGBANpJ
+      4jSDxo3Mcbca+40osSX2q9+p5hhlRKN8HkG6ucb9dJUyolA14JYbAR03FFnbvYnM
+      AsVbhjOLc6IL8EGS10k8BZca3QlbpfVkE2cKyVzVFF5mpWvp5Hw7jpmCVwEnHX/J
+      WmU/zyAPaO9XmeD41lupafe5h076GXJPiVTNfcjlAoGAe0VPwidXwxC9Wyk1xrYB
+      A29LtmV6SHd8tIav98mcJHxtsvsyZvBW+K0Hm9OXGsDoQHBWJMp3wWVphFMRL8nO
+      QgYlnyViVY58VXG1ZuKGYkciu6xd1d+bigha1Zc3L/8jGyCFyBSOzOuuoLtACvzf
+      PzVKfyStsk64PUT7MWTdvMsCgYAgnI8l51X/kz6d63MPaLfmgw60cI6GsIJrpjxi
+      94GPwAftzk2/i/0Mj+Y/th3dOt37OzZiw8St6LSSzhPLyCNPtp7jL0k8f6uwmI3p
+      hAwHSXIslEs8bwoKoV8xge57pptanvtZSwonsQWtVDoSCTsFIK9LKjWTz/uDP2y1
+      9alIHQKBgQDHt/HLaJS1Iqr+g9N56CbGztPEbMk4WvLnv6hbte1U/Qz3A7DEbK2g
+      q69ZQ4tEERziGG34o4e92QbDm9QqvcDeWQWCoznDXy5QcVa+LBFPPrD5V1lzopuJ
+      /76btyS2OfJe1Jcz43JX5/RD90q3Uo6Yi0j4NZwQb6TvFRyXnW5p2g==
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true