From 2591beb3abb4d7aa0ea30989e50e4bc707b7eae5 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 15 Dec 2015 13:44:29 -0500
Subject: latest compile

---
 hiera/goldeneye.yaml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'hiera/goldeneye.yaml')

diff --git a/hiera/goldeneye.yaml b/hiera/goldeneye.yaml
index 0fdbc06..151793b 100644
--- a/hiera/goldeneye.yaml
+++ b/hiera/goldeneye.yaml
@@ -32,10 +32,6 @@ couch:
       password: MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De
       salt: ac15331e0c098126e04ecf7a21045079
       username: soledad
-    tapicero: 
-      password: Gds68vK4JyZzPkUcEzBVEXdEFXq3jaFp
-      salt: 5b1b31b42c4cdce91ee8ccdb408d66ee
-      username: tapicero
     webapp: 
       password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t
       salt: 1c1dd6eb78f027414f1638bd6c902a5a
@@ -54,6 +50,20 @@ domain:
   name: goldeneye.cdev.bitmask.net
 enabled: true
 environment: clientdev
+firewall: 
+  soledad: 
+    from: "*"
+    port: 2323
+    to: "199.119.112.153"
+  ssh: 
+    from: sysadmin
+    port: 22
+    to: "199.119.112.153"
+  stunnel: 
+    - 
+      from: "199.119.112.152"
+      port: 15984
+      to: "199.119.112.153"
 hosts: 
   cowbird: 
     domain_full: cowbird.cdev.bitmask.net
@@ -85,6 +95,8 @@ services:
   - couchdb
   - soledad
 soledad: 
+  couchdb_leap_mx_user: 
+    username: leap_mx
   couchdb_soledad_user: 
     password: MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De
     salt: ac15331e0c098126e04ecf7a21045079
@@ -108,10 +120,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"
@@ -154,6 +162,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"
-- 
cgit v1.2.3