diff options
author | elijah <elijah@riseup.net> | 2015-10-06 10:09:45 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-10-06 10:09:45 -0700 |
commit | 0012f53720e0bef256b0faf9d33d310175ad8117 (patch) | |
tree | b87d543e4a7a4d2a3807fe61a50653766c2d5eae /hiera/aardwolf.yaml | |
parent | 017be84623395009fa0b082094ff16fb52272879 (diff) | |
parent | 5a7a84823c685b52aa3a7a1a699f1d894f8c2202 (diff) |
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'hiera/aardwolf.yaml')
-rw-r--r-- | hiera/aardwolf.yaml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml index 18d2972..8219b4a 100644 --- a/hiera/aardwolf.yaml +++ b/hiera/aardwolf.yaml @@ -31,10 +31,6 @@ couch: password: 35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf salt: 7f725f3cc60c388e9af8140555e09dfa username: soledad - tapicero: - password: VwgddQnXRJrbYpZaU3eIcxUHyXJPMIxI - salt: 40536188b5b346b585cd85ea35060d23 - username: tapicero webapp: password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew salt: 478bf7e8ca879a9711b279055f00153e @@ -53,6 +49,16 @@ domain: name: aardwolf.unstable.bitmask.net enabled: true environment: unstable +firewall: + soledad: + from: "*" + port: 2323 + to: "199.119.112.124" + ssh: + from: sysadmin + port: 22 + to: "199.119.112.124" + stunnel: [] hosts: aardwolf: domain_full: aardwolf.unstable.bitmask.net @@ -107,10 +113,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" |