6 files changed, 92 insertions, 73 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index c0a206b..2783579 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -85,8 +85,8 @@ mail:
     - leech.demo.bitmask.net
 name: ant
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.7"
+  version: "0.7.1"
 service_type: internal_service
 services: 
   - couchdb
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index a4d8757..392c48f 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -82,18 +82,16 @@ mynetworks:
   - "199.119.112.152"
   - "199.119.112.153"
   - "199.119.112.8"
-  - "202.85.233.34"
   - "204.13.164.162"
   - "204.13.164.171"
   - "204.13.164.57"
+  - "37.218.240.101"
   - "46.165.242.166"
   - "85.17.92.143"
 name: leech
 platform: 
-  major_version: "0.8"
-  version: "0.8"
-rbls: 
-  - zen.spamhaus.org
+  major_version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - mx
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 0f24b22..b64ce3b 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -54,8 +54,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index edfd58a..b3663bb 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -54,8 +54,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index 3438198..bf8c6a3 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -86,8 +86,8 @@ mail:
     - leech.demo.bitmask.net
 name: thrips
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 823a921..43b47fe 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -1,6 +1,5 @@
 --- 
 api: 
-  ca_cert_uri: "https://demo.bitmask.net/ca.crt"
   domain: api.demo.bitmask.net
   port: 4430
 contacts: 
@@ -117,7 +116,6 @@ definition_files:
           }
         },
         "services": [
-          "= enabled_services",
           "openvpn"
         ]
       }
@@ -233,8 +231,8 @@ nickserver:
   domain: nicknym.demo.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.8"
-  version: "0.8"
+  major_version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - webapp
@@ -354,7 +352,6 @@ webapp:
     salt: c632af58769857bcdf108b46da9eaa44
     username: webapp
   customization_dir: /srv/leap/files/webapp/
-  default_locale: en
   default_service_level: 1
   domain: demo.bitmask.net
   engines: 
@@ -397,11 +394,6 @@ webapp:
     - tickets
     - vmail
     - www-data
-  locales: 
-    - de
-    - en
-    - es
-    - pt
   modules: 
     - billing
     - help
@@ -452,33 +444,38 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIE+TCCAuGgAwIBAgIQf2VP0SlAHk2CKiWJEkUgzDANBgkqhkiG9w0BAQsFADBK
+      MIIF+TCCA+GgAwIBAgIQKv5Gnx9yruTOC1YH6QH95TANBgkqhkiG9w0BAQsFADBK
       MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTUxMDAyMDAwMDAwWhcNMTYx
       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=
+      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
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -725,31 +722,55 @@ 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