Merge branch 'master' of ssh://leap.se/bitmask

Conflicts:
	hiera/octopus.yaml
	hiera/panda.yaml
	hiera/seahorse.yaml
	secrets.json

4 files changed, 31 insertions, 31 deletions

diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index 8eb3dff..c26d2c4 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -47,38 +47,38 @@ location:
 mail: 
   smarthost: []
 mynetworks: 
-  - "199.119.112.5"
-  - "192.168.5.5"
-  - "199.119.112.9"
-  - "192.168.5.9"
+  - "176.53.69.22"
+  - "199.119.112.8"
+  - "192.168.5.8"
+  - "176.53.69.127"
+  - "198.252.153.83"
+  - "204.13.164.57"
+  - "199.119.112.23"
+  - "192.168.5.23"
+  - "85.17.92.143"
+  - "198.252.153.82"
+  - "199.119.112.16"
+  - "192.168.5.16"
   - "199.119.112.10"
   - "192.168.5.10"
-  - "176.53.69.21"
-  - "204.13.164.162"
   - "198.252.153.85"
-  - "85.17.92.143"
   - "202.85.227.195"
+  - "199.119.112.9"
+  - "192.168.5.9"
+  - "176.53.69.13"
+  - "176.53.69.23"
+  - "176.53.69.21"
+  - "176.53.69.14"
   - "204.13.164.171"
+  - "199.119.112.5"
+  - "192.168.5.5"
+  - "199.119.112.12"
+  - "192.168.5.12"
   - "199.119.112.4"
   - "192.168.5.4"
-  - "198.252.153.83"
-  - "199.119.112.23"
-  - "192.168.5.23"
-  - "176.53.69.14"
-  - "199.119.112.8"
-  - "192.168.5.8"
-  - "176.53.69.22"
   - "199.119.112.19"
   - "192.168.5.19"
-  - "176.53.69.127"
-  - "204.13.164.57"
-  - "176.53.69.13"
-  - "199.119.112.12"
-  - "192.168.5.12"
-  - "199.119.112.16"
-  - "192.168.5.16"
-  - "176.53.69.23"
-  - "198.252.153.82"
+  - "204.13.164.162"
 name: octopus
 service_type: user_service
 services: 
diff --git a/hiera/panda.yaml b/hiera/panda.yaml
index d287362..22f4c58 100644
--- a/hiera/panda.yaml
+++ b/hiera/panda.yaml
@@ -24,8 +24,8 @@ couch:
       salt: b54d7b0f595d7318d961c636fb8f5530
       username: nickserver
     replication: 
-      password: GN2VdL_ne7t6565khATUUeuJ7LzTMK8Q
-      salt: 07b36d548de1122917dde8a394ea5ee1
+      password: LZg8s_Z6FCg2MZRQYjkYeE6arCIU2pCw
+      salt: b004ef682f926531fdda36e26d48c4fa
       username: replication
     soledad: 
       password: 35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index 91d7a88..ef76f27 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -27,8 +27,8 @@ name: seahorse
 obfsproxy: 
   gateway_address: "199.119.112.13"
   scramblesuit: 
-    password: NV4XMUKXMJDEY3LDGN3UWRJTKJDHIRSH
-    port: 25659
+    password: K52VQ53KKNVFE2TLLJKFS3SYKRKEENTO
+    port: 22088
 openvpn: 
   adblock: false
   allow_limited: false
diff --git a/secrets.json b/secrets.json
index 64ae007..85b6878 100644
--- a/secrets.json
+++ b/secrets.json
@@ -83,8 +83,8 @@
     "couch_leap_mx_password_salt": "b4ac83520fa38b3acb722984fe5e3343",
     "couch_nickserver_password": "PzzQwxCvQLZUxRdS2jshMPN37Ps4qtbH",
     "couch_nickserver_password_salt": "b54d7b0f595d7318d961c636fb8f5530",
-    "couch_replication_password": "GN2VdL_ne7t6565khATUUeuJ7LzTMK8Q",
-    "couch_replication_password_salt": "07b36d548de1122917dde8a394ea5ee1",
+    "couch_replication_password": "LZg8s_Z6FCg2MZRQYjkYeE6arCIU2pCw",
+    "couch_replication_password_salt": "b004ef682f926531fdda36e26d48c4fa",
     "couch_soledad_password": "35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf",
     "couch_soledad_password_salt": "7f725f3cc60c388e9af8140555e09dfa",
     "couch_tapicero_password": "VwgddQnXRJrbYpZaU3eIcxUHyXJPMIxI",
@@ -93,8 +93,8 @@
     "couch_webapp_password_salt": "478bf7e8ca879a9711b279055f00153e",
     "nagios_admin_password": "r35FbwIuktJZXFfbnrVxCh8StDnIzhXj",
     "nagios_test_password": "SvVjM5NCe2RF6XwTtZ7dGxAZ7E7KeSNS",
-    "scramblesuit_password_seahorse": "NV4XMUKXMJDEY3LDGN3UWRJTKJDHIRSH",
-    "scramblesuit_port_seahorse": 25659,
+    "scramblesuit_password_seahorse": "K52VQ53KKNVFE2TLLJKFS3SYKRKEENTO",
+    "scramblesuit_port_seahorse": 22088,
     "webapp_secret_token": "aC9zAs6X5YE_9EC_RQckGCFkKfJ4vTAJ"
   }
 }