summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hiera/ant.yaml3
-rw-r--r--hiera/donkey.yaml4
-rw-r--r--hiera/gecko.yaml2
-rw-r--r--hiera/leech.yaml75
-rw-r--r--hiera/millipede.yaml3
-rw-r--r--hiera/mudskipper.yaml2
-rw-r--r--hiera/otter.yaml3
7 files changed, 10 insertions, 82 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index a159350..4ab8ab0 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -72,8 +72,7 @@ location:
name: "Seattle, WA"
timezone: "-7"
mail:
- smarthost:
- - leech.demo.bitmask.net
+ smarthost: []
name: ant
platform:
major_version: "0.9"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 40ce0f0..5506323 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -568,8 +568,8 @@ services:
- webapp
sources:
apt:
- backports: "http://httpredir.debian.org/debian/"
- basic: "http://httpredir.debian.org/debian/"
+ backports: "http://deb.debian.org/debian/"
+ basic: "http://deb.debian.org/debian/"
security: "http://security.debian.org/"
leap-mx:
package: leap-mx
diff --git a/hiera/gecko.yaml b/hiera/gecko.yaml
index 84394b8..9ea4833 100644
--- a/hiera/gecko.yaml
+++ b/hiera/gecko.yaml
@@ -109,7 +109,7 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/experimental-0.9"
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index d7fc3f6..42bb13e 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -5,15 +5,9 @@ api:
port: 4430
uri: "https://api.demo.bitmask.net:4430/1"
version: 1
-clamav:
- whitelisted_addresses: []
contacts:
- elijah@leap.se
- sysdev@leap.se
-couchdb_leap_mx_user:
- password: RcW_Xm2ERaZruapjSqQkhGeGIKgFLzML
- salt: 44cebadcb0fffe36a13d88091aaffeb9
- username: leap_mx
definition_files:
eip_service: |-
{
@@ -129,20 +123,10 @@ definition_files:
smtp_service: |
{
"hosts": {
- "leech": {
- "hostname": "leech.demo.bitmask.net",
- "ip_address": "198.252.153.85",
- "location": "seattle__wa",
- "port": 465
- }
+
},
"locations": {
- "seattle__wa": {
- "country_code": "US",
- "hemisphere": "N",
- "name": "Seattle, WA",
- "timezone": "-7"
- }
+
},
"serial": 1,
"version": 1
@@ -186,12 +170,6 @@ domain:
enabled: true
environment: demo
firewall:
- mx:
- from: "*"
- port:
- - 25
- - 465
- to: "198.252.153.85"
ssh:
from: sysadmin
port: 4422
@@ -222,16 +200,6 @@ hosts:
host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI="
ip_address: "198.252.153.82"
port: 4422
- leech:
- aliases:
- - api.demo.bitmask.net
- - demo.bitmask.net
- - nicknym.demo.bitmask.net
- domain_full: leech.demo.bitmask.net
- domain_internal: leech.demo.bitmask.i
- host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
- ip_address: "198.252.153.85"
- port: 4422
ip_address: "198.252.153.85"
location:
country_code: US
@@ -240,34 +208,6 @@ location:
timezone: "-7"
mail:
smarthost: []
-mx:
- aliases: {}
- dkim:
- bit_size: 2048
- private_key: /srv/leap/files/mx/dkim.key
- public_key: /srv/leap/files/mx/dkim.pub
- selector: babcfe98e4
- key_lookup_domain: demo.bitmask.net
-mynetworks:
- - "1.209.122.111"
- - "1.209.122.112"
- - "1.209.122.123"
- - "176.53.69.13"
- - "176.53.69.14"
- - "176.53.69.22"
- - "198.252.153.82"
- - "198.252.153.83"
- - "198.252.153.85"
- - "199.119.112.150"
- - "199.119.112.205"
- - "199.119.112.206"
- - "199.119.112.207"
- - "199.119.112.208"
- - "199.119.112.223"
- - "204.13.164.171"
- - "37.218.240.50"
- - "46.165.242.166"
- - "85.17.92.143"
name: leech
nickserver:
couchdb_nickserver_user:
@@ -279,11 +219,8 @@ nickserver:
platform:
major_version: "0.9"
version: "0.9"
-rbls:
- - zen.spamhaus.org
-service_type: user_service
+service_type: public_service
services:
- - mx
- webapp
sources:
apt:
@@ -371,11 +308,6 @@ stunnel:
tags:
- demo
- seattle
-testing:
- api_hosts:
- - leech.demo.bitmask.net
- api_uri: "https://api.demo.bitmask.net:4430/1"
- monitor_auth_token: pvUz85Prt4jXF5aypSaBVeyeHBgHDcj5
webapp:
admins:
- azul
@@ -478,7 +410,6 @@ webapp:
name: free
services:
- eip
- - email
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 64aa53d..97da1fd 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -34,8 +34,7 @@ location:
name: "Seattle, WA"
timezone: "-7"
mail:
- smarthost:
- - leech.demo.bitmask.net
+ smarthost: []
name: millipede
obfsproxy:
gateway_address: "198.252.153.84"
diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml
index 6e931ba..2d1d1c4 100644
--- a/hiera/mudskipper.yaml
+++ b/hiera/mudskipper.yaml
@@ -241,7 +241,7 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/experimental-0.9"
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index cfcbc9c..a04eb04 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -34,8 +34,7 @@ location:
name: Frankfurt
timezone: "+1"
mail:
- smarthost:
- - leech.demo.bitmask.net
+ smarthost: []
name: otter
obfsproxy:
gateway_address: "46.165.242.169"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 17:43:04 +0000