recompiled 'development' hiera files

9 files changed, 249 insertions, 143 deletions

diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index fc16e41..a458f42 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -9,6 +9,8 @@ couch:
     neighbors: 
       - elk.dev.bitmask.net
       - urchin.dev.bitmask.net
+  master: false
+  mode: multimaster
   port: 5984
   users: 
     admin: 
@@ -23,6 +25,10 @@ couch:
       password: VH7PcCGPLAIy8WHcLIJxVKnUpR7A2EuM
       salt: 70bcff5aeb5a7ed22a96a4b43790965f
       username: nickserver
+    replication: 
+      password: _mVfcIyFV_vfRFUvpNmAWYn_9KUxJ7Pv
+      salt: b53363c123da0677255bd93ec1627db7
+      username: replication
     soledad: 
       password: PgrbUREhqBGY4r4XIXQEgkk3jTH4sEJA
       salt: e3bec4f7126db333ce796beabd322244
@@ -128,33 +134,39 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_server: 
-    accept: 15984
-    connect: "127.0.0.1:5984"
-  ednp_clients: 
-    elk_9002: 
-      accept_port: 4003
-      connect: elk.dev.bitmask.i
-      connect_port: 19002
-    urchin_9002: 
-      accept_port: 4002
-      connect: urchin.dev.bitmask.i
-      connect_port: 19002
-  ednp_server: 
-    accept: 19002
-    connect: "127.0.0.1:9002"
-  epmd_clients: 
-    elk_4369: 
-      accept_port: 4001
-      connect: elk.dev.bitmask.i
-      connect_port: 14369
-    urchin_4369: 
-      accept_port: 4000
-      connect: urchin.dev.bitmask.i
-      connect_port: 14369
-  epmd_server: 
-    accept: 14369
-    connect: "127.0.0.1:4369"
+  clients: 
+    ednp_clients: 
+      elk_9002: 
+        accept_port: 4002
+        connect: elk.dev.bitmask.i
+        connect_port: 19002
+        original_port: 9002
+      urchin_9002: 
+        accept_port: 4003
+        connect: urchin.dev.bitmask.i
+        connect_port: 19002
+        original_port: 9002
+    epmd_clients: 
+      elk_4369: 
+        accept_port: 4000
+        connect: elk.dev.bitmask.i
+        connect_port: 14369
+        original_port: 4369
+      urchin_4369: 
+        accept_port: 4001
+        connect: urchin.dev.bitmask.i
+        connect_port: 14369
+        original_port: 4369
+  servers: 
+    couch_server: 
+      accept_port: 15984
+      connect_port: 5984
+    ednp_server: 
+      accept_port: 19002
+      connect_port: 9002
+    epmd_server: 
+      accept_port: 14369
+      connect_port: 4369
 tags: 
   - development
   - istanbul
@@ -220,6 +232,9 @@ x509:
       NJ/5m/kwQZOJdNjssvRdYAYG2VuwTVt/8ejLrq/tcuO0ta/o/jdgCwxNbtVT7Urx
       DNGMp2memyLq2GSAJBVeQLkHMXEZ0l7n60W9HtSi8HRi+g/1RXLCCmJmCznK
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEpAIBAAKCAQEAxreszkHDggU/qBvfJi9/YvhglBrLggiRLv2hkL/SG19L/MGR
@@ -249,3 +264,4 @@ x509:
       s8vZiNUDmQxGvoSGMUHi7/30ljfz4V0JJJsx87WKCoLNaGr6L0bn4A==
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
diff --git a/hiera/deer.yaml b/hiera/deer.yaml
index 974d468..840c3cf 100644
--- a/hiera/deer.yaml
+++ b/hiera/deer.yaml
@@ -63,6 +63,9 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 22
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - development
   - hongkong
@@ -135,6 +138,9 @@ x509:
       IDw63bvqLn7uZ+pv+2OIxIe5i/esj36WYCqJjz2O7QctCmwpKUlpdmO2/OXqpSjM
       fZ4URGMXVprYbH8H+ni8HiRFMpce9MsJ27WMKVFOBsOCzLiZ086Ijj5QOO5dDg==
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEogIBAAKCAQEA15F0kuSbJnsfxHKM1Lc7rw16FffSTHKC5l7CMkUgw0mu68Lr
@@ -164,3 +170,4 @@ x509:
       JeG/5McfwcQ1KqmAKjgMiz1rhjH9rpHGki2PFpA5LSHtCiqTSMM=
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 9b82dc5..96526f8 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -13,7 +13,7 @@ domain:
   name: demodex.dev.bitmask.i
 enabled: true
 environment: development
-hosts: ~
+hosts: {}
 ip_address: "204.13.164.171"
 location: 
   country_code: US
@@ -63,6 +63,9 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 22
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - demo
   - development
@@ -130,6 +133,9 @@ x509:
       OpW3YVHUtq5gAPHXSXXxgfbwhOJPrNz5h8cEwfdKuf0FjDmqPVo+esSLzNmk/Yqu
       duiea0DC
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEowIBAAKCAQEAxSWu0H81A7drU5TuWfkBp8fav6NL3UB/oSSa7PejOgYeZFDv
@@ -159,3 +165,4 @@ x509:
       pZ6P9+pgSVf5LDIix7I8gOAkrCwmrGe4IG8eun5bm998njtK+nGQ
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 299dff7..3950303 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -157,22 +157,27 @@ domain:
 enabled: true
 environment: development
 haproxy: 
-  servers: 
-    clam: 
-      backup: false
-      host: localhost
-      port: 4001
-      weight: 100
-    elk: 
-      backup: false
-      host: localhost
-      port: 4002
-      weight: 100
-    urchin: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      clam: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
+      elk: 
+        backup: false
+        host: localhost
+        port: 4001
+        weight: 100
+        writable: true
+      urchin: 
+        backup: false
+        host: localhost
+        port: 4002
+        weight: 100
+        writable: true
 hosts: 
   clam: 
     domain_full: clam.dev.bitmask.net
@@ -251,19 +256,24 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_client: 
-    clam_5984: 
-      accept_port: 4001
-      connect: clam.dev.bitmask.i
-      connect_port: 15984
-    elk_5984: 
-      accept_port: 4002
-      connect: elk.dev.bitmask.i
-      connect_port: 15984
-    urchin_5984: 
-      accept_port: 4000
-      connect: urchin.dev.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      clam_5984: 
+        accept_port: 4000
+        connect: clam.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      elk_5984: 
+        accept_port: 4001
+        connect: elk.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      urchin_5984: 
+        accept_port: 4002
+        connect: urchin.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - development
   - istanbul
@@ -279,6 +289,7 @@ webapp:
     - azul
   allow_anonymous_certs: false
   allow_limited_certs: false
+  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   billing: 
@@ -303,6 +314,8 @@ webapp:
   customization_dir: /etc/leap/files/webapp/
   default_service_level: 1
   domain: dev.bitmask.net
+  engines: 
+    - support
   git: 
     revision: origin/develop
     source: "https://leap.se/git/leap_web"
@@ -626,3 +639,4 @@ x509:
       NdxVbJtqjjwFUl6KyrahCH7tTY83FxKN57JxlcjIzpFQCXGSNeV1jQI=
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true
diff --git a/hiera/elk.yaml b/hiera/elk.yaml
index 23e4dc8..e515286 100644
--- a/hiera/elk.yaml
+++ b/hiera/elk.yaml
@@ -9,6 +9,8 @@ couch:
     neighbors: 
       - clam.dev.bitmask.net
       - urchin.dev.bitmask.net
+  master: false
+  mode: multimaster
   port: 5984
   users: 
     admin: 
@@ -23,6 +25,10 @@ couch:
       password: VH7PcCGPLAIy8WHcLIJxVKnUpR7A2EuM
       salt: 70bcff5aeb5a7ed22a96a4b43790965f
       username: nickserver
+    replication: 
+      password: _mVfcIyFV_vfRFUvpNmAWYn_9KUxJ7Pv
+      salt: b53363c123da0677255bd93ec1627db7
+      username: replication
     soledad: 
       password: PgrbUREhqBGY4r4XIXQEgkk3jTH4sEJA
       salt: e3bec4f7126db333ce796beabd322244
@@ -120,33 +126,39 @@ ssh:
     ports: "60000:61000"
   port: 22
 stunnel: 
-  couch_server: 
-    accept: 15984
-    connect: "127.0.0.1:5984"
-  ednp_clients: 
-    clam_9002: 
-      accept_port: 4003
-      connect: clam.dev.bitmask.i
-      connect_port: 19002
-    urchin_9002: 
-      accept_port: 4002
-      connect: urchin.dev.bitmask.i
-      connect_port: 19002
-  ednp_server: 
-    accept: 19002
-    connect: "127.0.0.1:9002"
-  epmd_clients: 
-    clam_4369: 
-      accept_port: 4001
-      connect: clam.dev.bitmask.i
-      connect_port: 14369
-    urchin_4369: 
-      accept_port: 4000
-      connect: urchin.dev.bitmask.i
-      connect_port: 14369
-  epmd_server: 
-    accept: 14369
-    connect: "127.0.0.1:4369"
+  clients: 
+    ednp_clients: 
+      clam_9002: 
+        accept_port: 4002
+        connect: clam.dev.bitmask.i
+        connect_port: 19002
+        original_port: 9002
+      urchin_9002: 
+        accept_port: 4003
+        connect: urchin.dev.bitmask.i
+        connect_port: 19002
+        original_port: 9002
+    epmd_clients: 
+      clam_4369: 
+        accept_port: 4000
+        connect: clam.dev.bitmask.i
+        connect_port: 14369
+        original_port: 4369
+      urchin_4369: 
+        accept_port: 4001
+        connect: urchin.dev.bitmask.i
+        connect_port: 14369
+        original_port: 4369
+  servers: 
+    couch_server: 
+      accept_port: 15984
+      connect_port: 5984
+    ednp_server: 
+      accept_port: 19002
+      connect_port: 9002
+    epmd_server: 
+      accept_port: 14369
+      connect_port: 4369
 tags: 
   - development
   - istanbul
@@ -212,6 +224,9 @@ x509:
       NMcH+IxVJJuTC2AxHfFWE+RjRC01QvUFu4xCO81DqH/0FUHyzTP9+nE6wWxbByGX
       jDPYiUN+F2GQ41IxNLT/JAH5EVVCiT0YtJbo2hZkjzVXUhQHMxgU9ygK
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEowIBAAKCAQEAozugB+KNmoKBkuvXZwOz+LUVwOlWUPf56hNnySHJsLmLw3iH
@@ -241,3 +256,4 @@ x509:
       IMGocdmFkCEm2+P9AgnftFoHmtZ7GE8xyKsr3bZlhdB0dNJoPgBK
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 0b05ea8..5b6d538 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -13,7 +13,7 @@ domain:
   name: ladybug.dev.bitmask.i
 enabled: true
 environment: development
-hosts: ~
+hosts: {}
 ip_address: "199.119.112.8"
 location: 
   country_code: US
@@ -63,6 +63,9 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 22
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - development
   - dc
@@ -129,6 +132,9 @@ x509:
       2N0VqoLqitPE/iBC/2Huwtf8fjEy61PFpGTne4vYmuwyzn5B57vOtxZFxnXObvXc
       vq8Eyi/G
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEowIBAAKCAQEAuDTBPS/WvkPu/MXZNrGv3yUYMfcAO7P1QNSaoDX5vwp0jYaW
@@ -158,3 +164,4 @@ x509:
       x/blabS5bQlWQqZyHrHU0yc5U95aJNjZ6bqe3lBQAzB5tg80X20m
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index c6a7d63..72670db 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -13,7 +13,7 @@ domain:
   name: snail.dev.bitmask.net
 enabled: true
 environment: development
-hosts: ~
+hosts: {}
 ip_address: "176.53.69.14"
 location: 
   country_code: TR
@@ -24,6 +24,11 @@ mail:
   smarthost: 
     - starfish.dev.bitmask.net
 name: snail
+obfsproxy: 
+  gateway_address: "176.53.69.19"
+  scramblesuit: 
+    password: OY3FIR2JIJ3WEWRYPJRVS5SGOJLEG3SU
+    port: 24218
 openvpn: 
   adblock: false
   allow_free: false
@@ -86,6 +91,9 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 4422
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - development
   - istanbul
@@ -185,6 +193,9 @@ x509:
       xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF
       gkVBxxt/s0R2aKM=
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   dh: |
       -----BEGIN DH PARAMETERS-----
       MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
@@ -226,3 +237,4 @@ x509:
       mWp6XljeEFxSWnhqAcsmT7I7YTZcv8QA5KkZCSwBrvuEYFNOrmnp
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 68340e3..2b65800 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -18,22 +18,27 @@ domain:
 enabled: true
 environment: development
 haproxy: 
-  servers: 
-    clam: 
-      backup: false
-      host: localhost
-      port: 4001
-      weight: 100
-    elk: 
-      backup: false
-      host: localhost
-      port: 4002
-      weight: 100
-    urchin: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      clam: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
+      elk: 
+        backup: false
+        host: localhost
+        port: 4001
+        weight: 100
+        writable: true
+      urchin: 
+        backup: false
+        host: localhost
+        port: 4002
+        weight: 100
+        writable: true
 hosts: 
   clam: 
     domain_full: clam.dev.bitmask.net
@@ -68,13 +73,13 @@ mynetworks:
   - "192.168.5.5"
   - "199.119.112.9"
   - "192.168.5.9"
-  - "202.85.227.204"
   - "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"
   - "204.13.164.171"
   - "199.119.112.4"
   - "192.168.5.4"
@@ -137,19 +142,24 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_client: 
-    clam_5984: 
-      accept_port: 4001
-      connect: clam.dev.bitmask.i
-      connect_port: 15984
-    elk_5984: 
-      accept_port: 4002
-      connect: elk.dev.bitmask.i
-      connect_port: 15984
-    urchin_5984: 
-      accept_port: 4000
-      connect: urchin.dev.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      clam_5984: 
+        accept_port: 4000
+        connect: clam.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      elk_5984: 
+        accept_port: 4001
+        connect: elk.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      urchin_5984: 
+        accept_port: 4002
+        connect: urchin.dev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - development
   - istanbul
@@ -457,3 +467,4 @@ x509:
       /oQmdpwxo0t1N48BuQwEddhBLrDFtWLaBnfiVhyydYn4K0ohFIC6
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true
diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml
index 80d37a3..1c38033 100644
--- a/hiera/urchin.yaml
+++ b/hiera/urchin.yaml
@@ -10,6 +10,8 @@ couch:
     neighbors: 
       - clam.dev.bitmask.net
       - elk.dev.bitmask.net
+  master: false
+  mode: multimaster
   port: 5984
   users: 
     admin: 
@@ -24,6 +26,10 @@ couch:
       password: VH7PcCGPLAIy8WHcLIJxVKnUpR7A2EuM
       salt: 70bcff5aeb5a7ed22a96a4b43790965f
       username: nickserver
+    replication: 
+      password: _mVfcIyFV_vfRFUvpNmAWYn_9KUxJ7Pv
+      salt: b53363c123da0677255bd93ec1627db7
+      username: replication
     soledad: 
       password: PgrbUREhqBGY4r4XIXQEgkk3jTH4sEJA
       salt: e3bec4f7126db333ce796beabd322244
@@ -129,33 +135,39 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_server: 
-    accept: 15984
-    connect: "127.0.0.1:5984"
-  ednp_clients: 
-    clam_9002: 
-      accept_port: 4002
-      connect: clam.dev.bitmask.i
-      connect_port: 19002
-    elk_9002: 
-      accept_port: 4003
-      connect: elk.dev.bitmask.i
-      connect_port: 19002
-  ednp_server: 
-    accept: 19002
-    connect: "127.0.0.1:9002"
-  epmd_clients: 
-    clam_4369: 
-      accept_port: 4000
-      connect: clam.dev.bitmask.i
-      connect_port: 14369
-    elk_4369: 
-      accept_port: 4001
-      connect: elk.dev.bitmask.i
-      connect_port: 14369
-  epmd_server: 
-    accept: 14369
-    connect: "127.0.0.1:4369"
+  clients: 
+    ednp_clients: 
+      clam_9002: 
+        accept_port: 4002
+        connect: clam.dev.bitmask.i
+        connect_port: 19002
+        original_port: 9002
+      elk_9002: 
+        accept_port: 4003
+        connect: elk.dev.bitmask.i
+        connect_port: 19002
+        original_port: 9002
+    epmd_clients: 
+      clam_4369: 
+        accept_port: 4000
+        connect: clam.dev.bitmask.i
+        connect_port: 14369
+        original_port: 4369
+      elk_4369: 
+        accept_port: 4001
+        connect: elk.dev.bitmask.i
+        connect_port: 14369
+        original_port: 4369
+  servers: 
+    couch_server: 
+      accept_port: 15984
+      connect_port: 5984
+    ednp_server: 
+      accept_port: 19002
+      connect_port: 9002
+    epmd_server: 
+      accept_port: 14369
+      connect_port: 4369
 tags: 
   - development
   - istanbul
@@ -222,6 +234,9 @@ x509:
       ybiYSdH+/McFmTTS/zAD9bA3erdGPrbpNhJTNorQ2MYFWF6I8jq/g8pCtwQfDDGl
       CFSx
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEpQIBAAKCAQEAqDWdRzzKP/nrzFrPMDtK3EVeGDfIS6vnzK0wbuNQfLL8Z7l/
@@ -251,3 +266,4 @@ x509:
       K9BonZtb9DtCLMn+agpixOwpLwWAyd0ICvSdMxnyVrNCQ1wwRcwXlJc=
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false