1 files changed, 6 insertions, 24 deletions
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 4eef99e..ac6e482 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -1,6 +1,4 @@
 --- 
-clamav: 
-  whitelisted_addresses: []
 contacts: 
   - elijah@leap.se
   - sysdev@leap.se
@@ -20,18 +18,6 @@ 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
@@ -75,9 +61,6 @@ location:
   timezone: "-7"
 mail: 
   smarthost: []
-mx: 
-  aliases: {}
-  key_lookup_domain: bitmask.net
 mynetworks: 
   - "1.209.122.24"
   - "1.209.122.26"
@@ -105,14 +88,11 @@ mynetworks:
   - "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
@@ -133,6 +113,10 @@ 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"
@@ -175,8 +159,6 @@ 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"