diff options
Diffstat (limited to 'hiera')
| -rw-r--r-- | hiera/aardwolf.yaml | 18 | ||||
| -rw-r--r-- | hiera/cat.yaml | 16 | ||||
| -rw-r--r-- | hiera/donkey.yaml | 24 | ||||
| -rw-r--r-- | hiera/tuatara.yaml | 16 |
4 files changed, 54 insertions, 20 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" diff --git a/hiera/cat.yaml b/hiera/cat.yaml index 0da646b..63cb174 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -17,6 +17,18 @@ domain: name: cat.unstable.bitmask.net enabled: true environment: unstable +firewall: + mx: + from: "*" + port: + - 25 + - 465 + to: "199.119.112.123" + ssh: + from: sysadmin + port: 22 + to: "199.119.112.123" + stunnel: [] haproxy: couch: listen_port: 4096 @@ -104,10 +116,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" 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" diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml index 14590fe..8c7e5ff 100644 --- a/hiera/tuatara.yaml +++ b/hiera/tuatara.yaml @@ -13,6 +13,18 @@ domain: name: tuatara.unstable.bitmask.net enabled: true environment: unstable +firewall: + ssh: + from: sysadmin + port: 22 + to: "199.119.112.147" + stunnel: [] + vpn: + from: "*" + port: + - 21724 + - "443" + to: "199.119.112.148" hosts: {} ip_address: "199.119.112.147" location: @@ -75,10 +87,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" |