1 files changed, 25 insertions, 6 deletions
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 392c48f..4eef99e 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -1,4 +1,6 @@
 --- 
+clamav: 
+  whitelisted_addresses: []
 contacts: 
   - elijah@leap.se
   - sysdev@leap.se
@@ -18,6 +20,18 @@ domain:
   name: leech.demo.bitmask.net
 enabled: true
 environment: demo
+firewall: 
+  mx: 
+    from: "*"
+    port: 
+      - 25
+      - 465
+    to: "198.252.153.85"
+  ssh: 
+    from: sysadmin
+    port: 4422
+    to: "198.252.153.85"
+  stunnel: []
 haproxy: 
   couch: 
     listen_port: 4096
@@ -61,6 +75,9 @@ location:
   timezone: "-7"
 mail: 
   smarthost: []
+mx: 
+  aliases: {}
+  key_lookup_domain: bitmask.net
 mynetworks: 
   - "1.209.122.24"
   - "1.209.122.26"
@@ -81,6 +98,8 @@ mynetworks:
   - "199.119.112.151"
   - "199.119.112.152"
   - "199.119.112.153"
+  - "199.119.112.167"
+  - "199.119.112.197"
   - "199.119.112.8"
   - "204.13.164.162"
   - "204.13.164.171"
@@ -90,8 +109,10 @@ mynetworks:
   - "85.17.92.143"
 name: leech
 platform: 
-  major_version: "0.7"
-  version: "0.7.1"
+  major_version: "0.8"
+  version: "0.8"
+rbls: 
+  - zen.spamhaus.org
 service_type: user_service
 services: 
   - mx
@@ -112,10 +133,6 @@ sources:
     package: soledad-server
     revision: latest
     type: apt
-  tapicero: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/tapicero"
-    type: git
   webapp: 
     revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
@@ -158,6 +175,8 @@ ssh:
     varac: 
       key: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
       type: ssh-rsa
+  config: 
+    AllowTcpForwarding: "no"
   mosh: 
     enabled: true
     ports: "60000:61000"