From 92cb903fda58c46a645e95a9e2e51136d5fa10ea Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 13 Jan 2016 09:52:27 -0800 Subject: demo: disable frankfurt vpn node, recompile. --- hiera/ant.yaml | 20 ++++++++++---------- hiera/leech.yaml | 30 ++++++------------------------ hiera/wallaby.yaml | 33 --------------------------------- nodes/otter.json | 3 ++- 4 files changed, 18 insertions(+), 68 deletions(-) diff --git a/hiera/ant.yaml b/hiera/ant.yaml index 3eb01b0..2783579 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -33,6 +33,10 @@ couch: password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC salt: 514355e86f1d3fa4de42b677de21281d username: soledad + tapicero: + password: 4JUh6VMj9Z9RmBLhNBGGkKqnYEYbxuba + salt: 143d18a3df3e46e505f4c061d2cc17b7 + username: tapicero webapp: password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg salt: c632af58769857bcdf108b46da9eaa44 @@ -51,12 +55,6 @@ domain: name: ant.demo.bitmask.i enabled: true environment: demo -firewall: - ssh: - from: sysadmin - port: 4422 - to: "198.252.153.82" - stunnel: [] hosts: ant: domain_full: ant.demo.bitmask.net @@ -87,8 +85,8 @@ mail: - leech.demo.bitmask.net name: ant platform: - major_version: "0.8" - version: "0.8" + major_version: "0.7" + version: "0.7.1" service_type: internal_service services: - couchdb @@ -109,6 +107,10 @@ 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" @@ -151,8 +153,6 @@ 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" diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 4eef99e..ac6e482 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -1,6 +1,4 @@ --- -clamav: - whitelisted_addresses: [] contacts: - elijah@leap.se - sysdev@leap.se @@ -20,18 +18,6 @@ domain: name: leech.demo.bitmask.net enabled: true environment: demo -firewall: - mx: - from: "*" - port: - - 25 - - 465 - to: "198.252.153.85" - ssh: - from: sysadmin - port: 4422 - to: "198.252.153.85" - stunnel: [] haproxy: couch: listen_port: 4096 @@ -75,9 +61,6 @@ location: timezone: "-7" mail: smarthost: [] -mx: - aliases: {} - key_lookup_domain: bitmask.net mynetworks: - "1.209.122.24" - "1.209.122.26" @@ -105,14 +88,11 @@ mynetworks: - "204.13.164.171" - "204.13.164.57" - "37.218.240.101" - - "46.165.242.166" - "85.17.92.143" name: leech platform: - major_version: "0.8" - version: "0.8" -rbls: - - zen.spamhaus.org + major_version: "0.7" + version: "0.7.1" service_type: user_service services: - mx @@ -133,6 +113,10 @@ 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" @@ -175,8 +159,6 @@ 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" diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index a38aef6..72d0062 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -29,36 +29,9 @@ definition_files: "host": "millipede.demo.bitmask.net", "ip_address": "198.252.153.84", "location": "seattle__wa" - }, - { - "capabilities": { - "adblock": false, - "filter_dns": false, - "limited": false, - "ports": [ - "443" - ], - "protocols": [ - "tcp", - "udp" - ], - "transport": [ - "openvpn" - ], - "user_ips": false - }, - "host": "otter.demo.bitmask.net", - "ip_address": "46.165.242.169", - "location": "frankfurt" } ], "locations": { - "frankfurt": { - "country_code": "DE", - "hemisphere": "N", - "name": "Frankfurt", - "timezone": "+1" - }, "seattle__wa": { "country_code": "US", "hemisphere": "N", @@ -352,7 +325,6 @@ webapp: salt: c632af58769857bcdf108b46da9eaa44 username: webapp customization_dir: /srv/leap/files/webapp/ - default_locale: en default_service_level: 1 domain: demo.bitmask.net engines: @@ -395,11 +367,6 @@ webapp: - tickets - vmail - www-data - locales: - - de - - en - - es - - pt modules: - billing - help diff --git a/nodes/otter.json b/nodes/otter.json index 47da31f..70258fe 100644 --- a/nodes/otter.json +++ b/nodes/otter.json @@ -4,5 +4,6 @@ "openvpn": { "gateway_address": "46.165.242.169" }, - "services": ["openvpn", "tor"] + "services": ["openvpn", "tor"], + "enabled": false } -- cgit v1.2.3