summaryrefslogtreecommitdiff
path: root/hiera/donkey.yaml
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-10-06 10:09:45 -0700
committerelijah <elijah@riseup.net>2015-10-06 10:09:45 -0700
commit0012f53720e0bef256b0faf9d33d310175ad8117 (patch)
treeb87d543e4a7a4d2a3807fe61a50653766c2d5eae /hiera/donkey.yaml
parent017be84623395009fa0b082094ff16fb52272879 (diff)
parent5a7a84823c685b52aa3a7a1a699f1d894f8c2202 (diff)
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'hiera/donkey.yaml')
-rw-r--r--hiera/donkey.yaml24
1 files changed, 20 insertions, 4 deletions
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index a23ecf9..bf8860d 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -152,6 +152,26 @@ domain:
name: donkey.unstable.bitmask.net
enabled: true
environment: unstable
+firewall:
+ monitor:
+ from: sysadmin
+ port:
+ - 443
+ - 80
+ to: "199.119.112.133"
+ ssh:
+ from: sysadmin
+ port: 22
+ to: "199.119.112.133"
+ stunnel: []
+ webapp:
+ from: "*"
+ port:
+ - 443
+ - 4430
+ - 6425
+ - 80
+ to: "199.119.112.133"
haproxy:
couch:
listen_port: 4096
@@ -641,10 +661,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"