regenerate cert for demo

1 files changed, 32 insertions, 30 deletions

diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index d9c8306..1de7f78 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -14,34 +14,34 @@ couch:
   port: 5984
   users: 
     admin: 
-      password: 5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw
-      salt: 402b758e70fc5ab21509fcb46df37f09
+      password: zmTmc8mBqwcrHIC4RUuca3LhKtKbjCub
+      salt: 0f74946306a097fc4ccb89a4ac12a6f0
       username: admin
     leap_mx: 
-      password: kh8Md4qQZupTX4qAYZDHP8LAXWFIkwkq
-      salt: b89cc440b6866bf25bba69d8ee22fc9d
+      password: bTkKWQjhevMHhheIhHCuHtcg8AghKtec
+      salt: 6891961f06676bdfc7f5a46d77cec2f0
       username: leap_mx
     nickserver: 
-      password: bnrSIcLQ7dd7zVZv7vqR5HIYIhLsBmK5
-      salt: 7dbe7b4faa32f9b7f67d6c9bb2d70cc4
+      password: bLzbnE92Jw8U7LFrVmMJp3nNn4hx3Knn
+      salt: 2ae7eb5c935d25aea5ac82b87d2e6298
       username: nickserver
     replication: 
-      password: R8mLjqcYRHCXKq4zADgBzVSq4cuhZjkj
-      salt: 9d6d26f5cd7677547c46d1f74185406f
+      password: LHwgXHRZ8m5777nHQNIA5svknVSqCR8C
+      salt: 477c73b94af6896027792ae7b713a5a7
       username: replication
     soledad: 
-      password: vR8CqkNx9XeLDWMZWaQNYFsQHsPDTPve
-      salt: efac408f3cda73ebcb02f80c9c3a0bfa
+      password: mWhxsSZF9H2d3fsMbpmH9SQCIBXAb2pz
+      salt: b988ebf96607fd6317b77c083a8a585f
       username: soledad
     webapp: 
-      password: BUHSRknNYnLEzQHuLesseraW8WZ9IMpM
-      salt: 1d0e3f0b126a69e19a1f6109fe8e2e40
+      password: xZZjnvmuRTVFPUg4jYQDJkayBfFb2Ws4
+      salt: f4fcbccdd0d985ca68120e4b85e7146d
       username: webapp
   webapp: 
-    nagios_test_pw: XYjpnIvA3YHA75cfNsSCc2FYNhzB5FSv
+    nagios_test_pw: znHfAeMKkJrxawAxR8qCSXT4ZRKcDmv4
 couchdb_leap_mx_user: 
-  password: kh8Md4qQZupTX4qAYZDHP8LAXWFIkwkq
-  salt: b89cc440b6866bf25bba69d8ee22fc9d
+  password: bTkKWQjhevMHhheIhHCuHtcg8AghKtec
+  salt: 6891961f06676bdfc7f5a46d77cec2f0
   username: leap_mx
 couchdb_port: 5984
 definition_files: 
@@ -151,7 +151,7 @@ domain:
   internal_suffix: mail.bitmask.i
   name: alpaca.mail.bitmask.net
 enabled: true
-environment: mail
+environment: demomail
 firewall: 
   mx: 
     from: "*"
@@ -226,8 +226,8 @@ mynetworks:
 name: alpaca
 nickserver: 
   couchdb_nickserver_user: 
-    password: bnrSIcLQ7dd7zVZv7vqR5HIYIhLsBmK5
-    salt: 7dbe7b4faa32f9b7f67d6c9bb2d70cc4
+    password: bLzbnE92Jw8U7LFrVmMJp3nNn4hx3Knn
+    salt: 2ae7eb5c935d25aea5ac82b87d2e6298
     username: nickserver
   domain: nicknym.mail.bitmask.net
   port: 6425
@@ -246,8 +246,8 @@ soledad:
   couchdb_leap_mx_user: 
     username: leap_mx
   couchdb_soledad_user: 
-    password: vR8CqkNx9XeLDWMZWaQNYFsQHsPDTPve
-    salt: efac408f3cda73ebcb02f80c9c3a0bfa
+    password: mWhxsSZF9H2d3fsMbpmH9SQCIBXAb2pz
+    salt: b988ebf96607fd6317b77c083a8a585f
     username: soledad
   port: 2323
 sources: 
@@ -265,7 +265,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/platform"
       component: snapshots
   soledad: 
     package: soledad-server
@@ -283,6 +283,9 @@ ssh:
     chiiph: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDAotYxNrKKXihZrDd39iKrXZSm3r8L9SNzhe9JG6cPaLTYuxhrS9QejYih9noboWfsVFmNPFYH42u3/vMyJEtf1WEUqQ84Qh2oQaC3orGMdpo3fXlCwlcp9q55gZTbSkpKwjn4pmg++wdTNjMmldi1ifPDl2uVt7dUkjQk8hy7CTJofkTxrXIzGZx+OI0knuos+lNV1uU3nJ6upbBwkvxwy3S9nfZ9kq7y5PBo0wK9YkOrKIAZtCnb0nobOiFMPeQDJdBWIo0btv5tCtzqe/b28TYz6DrMWrLIEJ+t8PH6QxaB0oLtlx5fImRxykLVHEe9AO1WcV0aXW4+6ZsHRG4X
       type: ssh-rsa
+    cirunner: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDEtniDgIYEm4WtGgiQsZKBpY8x3tbzDBIoMLbZT496juCu4c3f+F5KkMPLmYRPcAupF8tVf+j7Fns7z69PuTjdGfe/cA9CTw/4sNAu3iLpunGR0d2Wtctez5mwz13bKRu9fck3H9p2F9Z47vMKtRTJJ6iIgaUVWU/eFd/MSMJeUVd2ns4Wr7SkHCBB3PV+QL1xl4+AZsUtnGVQ5cE4MZZFia/g6SlrKQYFtLRVIIpDuuaDSvULg1BFMhSCBDNygts8dKTJsCEQYeGVvHZaDwtKTnMqEIwBP4TkIoP+YWnZTPrGywFEJOlZ8b+4HdgdUAFLcFCycWMM9nVcWX7P2lIN
+      type: ssh-rsa
     db: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCZoVRqaxZL4Btmt7Nfcj0jNbM5UhBSFl37MWApS9qUlx1zJeH7Vw1ZRzUT8zLtdpOyL4JrF1jJ+D25/dqdTEv5dc7I/IcUz16uVD3REi9wk9uRo05DmG1PXQ0Pp3kRGhNFTh5e1ZeGbPlxZkHyUirWGz8A6hrPTUA/k+KRsQg4nH+3UTPzZcy3jvw6YvdATFNkZ5dhKyae9T41McBEdh5yPArfuVTL/ssckTxyISF5ObsvbzuuarTeNQQO5VpFvK9luKzXpta9IRHMeAHpu88MCiMcWiZUZlaVlD9tC6OcMNxCBWWMlNwtowgBmoIZnjo7NrMsJ1ksUT4eDsvf6huu9nX3KIigSUeuWPtaPMHCghhLXLQSuIOhQWXjFzl+KzgiOZ4ahmNMqiCaRFHAHw6BRuZRxphiMq2gjvKRg6a4giDIf9gkEQ6v+tiUQoGYXuwfb0sGVJfrnZVifUz+I1j0wWCBWaY7+/LtfaNIl1byyPzG+qRhHMUlj/IALnT4DuHM+VkXNyQ0fucGcyhFxabqfdxRUT0EQok8ib06f16JBCoqdd6bn64v1M29QGFeSF0t4zjqqDik7VQvOMph2WAZv9FwhvPrmbSSs3MIe7wVBaFC8zeavrZ8oCO1U40q2UcntO6Z0NpIhnGZC7zVxguEux1moAtWIE0+JIsrbu41gQ==
       type: ssh-rsa
@@ -335,12 +338,11 @@ stunnel:
 tags: 
   - dc
   - demomail
-  - mail
 testing: 
   api_hosts: 
     - alpaca.mail.bitmask.net
   api_uri: "https://api.mail.bitmask.net:4430/1"
-  monitor_auth_token: vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2
+  monitor_auth_token: sLEMhZk5VgjuXTFkgyzkPspV9cVSfLHN
 webapp: 
   admins: 
     - azul
@@ -359,7 +361,7 @@ webapp:
   api_tokens: 
     allowed_ips: 
       - "199.119.112.223"
-    monitor: vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2
+    monitor: sLEMhZk5VgjuXTFkgyzkPspV9cVSfLHN
   api_version: 1
   client_certificates: 
     bit_size: 2048
@@ -371,13 +373,13 @@ webapp:
     max: ~
     min: "0.9.4"
   couchdb_admin_user: 
-    password: 5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw
-    salt: 402b758e70fc5ab21509fcb46df37f09
+    password: zmTmc8mBqwcrHIC4RUuca3LhKtKbjCub
+    salt: 0f74946306a097fc4ccb89a4ac12a6f0
     username: admin
   couchdb_port: 5984
   couchdb_webapp_user: 
-    password: BUHSRknNYnLEzQHuLesseraW8WZ9IMpM
-    salt: 1d0e3f0b126a69e19a1f6109fe8e2e40
+    password: xZZjnvmuRTVFPUg4jYQDJkayBfFb2Ws4
+    salt: f4fcbccdd0d985ca68120e4b85e7146d
     username: webapp
   customization_dir: /srv/leap/files/mail_webapp/
   default_locale: en
@@ -434,9 +436,9 @@ webapp:
     - help
     - user
   nagios_test_user: 
-    password: XYjpnIvA3YHA75cfNsSCc2FYNhzB5FSv
+    password: znHfAeMKkJrxawAxR8qCSXT4ZRKcDmv4
     username: nagios_test
-  secret_token: 43bMDssusIZfqnAsDnfrKNVt9mNuLwad
+  secret_token: NzzrnxL4EXUUvNhDhteMzAZCkBqphgSC
   secure: false
   service_levels: 
     1: