1 files changed, 16 insertions, 8 deletions
diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml
index 31accc9..d444faa 100644
--- a/hiera/gorilla.yaml
+++ b/hiera/gorilla.yaml
@@ -36,10 +36,6 @@ couch:
       password: kC3G8VUw_EHauUW_HaqVVmURd7W_LLKm
       salt: 9d8f48690250981009ee2429aabdc78d
       username: soledad
-    tapicero: 
-      password: GzSQ2dc4j6fwTRXPSSjLWMM4uh2e42eG
-      salt: 221102bb1eda20211d6408fbcd9feef6
-      username: tapicero
     webapp: 
       password: SFHnQkZjz8SFNFpS4p355wmmh4vP9VXH
       salt: 657e9462c07b5f3086a06c744e76f10d
@@ -59,6 +55,20 @@ domain:
   name: gorilla.bleeding.bitmask.i
 enabled: true
 environment: bleeding
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 22
+    to: "1.209.122.26"
+  stunnel: 
+    - 
+      from: "1.209.122.24"
+      port: 14369
+      to: "1.209.122.26"
+    - 
+      from: "1.209.122.24"
+      port: 19002
+      to: "1.209.122.26"
 hosts: 
   armadillo: 
     domain_full: armadillo.bleeding.bitmask.net
@@ -104,10 +114,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"
@@ -150,6 +156,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"