summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
Diffstat (limited to 'hiera')
-rw-r--r--hiera/ant.yaml4
-rw-r--r--hiera/armadillo.yaml4
-rw-r--r--hiera/clam.yaml4
-rw-r--r--hiera/couch1.yaml4
-rw-r--r--hiera/couch2.yaml4
-rw-r--r--hiera/cowbird.yaml6
-rw-r--r--hiera/deer.yaml4
-rw-r--r--hiera/demodex.yaml4
-rw-r--r--hiera/diplocaulus.yaml4
-rw-r--r--hiera/elephant.yaml8
-rw-r--r--hiera/firefly.yaml4
-rw-r--r--hiera/goldeneye.yaml4
-rw-r--r--hiera/gorilla.yaml4
-rw-r--r--hiera/hippo.yaml4
-rw-r--r--hiera/ladybug.yaml4
-rw-r--r--hiera/leech.yaml6
-rw-r--r--hiera/millipede.yaml4
-rw-r--r--hiera/mx1.yaml6
-rw-r--r--hiera/otter.yaml4
-rw-r--r--hiera/ovenbird.yaml11
-rw-r--r--hiera/plain1.yaml4
-rw-r--r--hiera/seahorse.yaml4
-rw-r--r--hiera/snail.yaml4
-rw-r--r--hiera/starfish.yaml6
-rw-r--r--hiera/thrips.yaml4
-rw-r--r--hiera/tor1.yaml4
-rw-r--r--hiera/vpn1.yaml4
-rw-r--r--hiera/wallaby.yaml12
-rw-r--r--hiera/web1.yaml11
29 files changed, 92 insertions, 58 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 2783579..c0a206b 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -85,8 +85,8 @@ mail:
- leech.demo.bitmask.net
name: ant
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- couchdb
diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml
index 44c6a56..63fa910 100644
--- a/hiera/armadillo.yaml
+++ b/hiera/armadillo.yaml
@@ -82,8 +82,8 @@ mail:
smarthost: []
name: armadillo
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- couchdb
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 23ca83b..e1abb4c 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -78,8 +78,8 @@ mail:
- starfish.dev.bitmask.net
name: clam
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- couchdb
diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml
index 709b2d9..7e70139 100644
--- a/hiera/couch1.yaml
+++ b/hiera/couch1.yaml
@@ -77,8 +77,8 @@ mail:
- mx1.bitmask.net
name: couch1
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- couchdb
diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml
index 90777d7..e5d0dd8 100644
--- a/hiera/couch2.yaml
+++ b/hiera/couch2.yaml
@@ -77,8 +77,8 @@ mail:
- mx1.bitmask.net
name: couch2
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- couchdb
diff --git a/hiera/cowbird.yaml b/hiera/cowbird.yaml
index b0f3679..98b29fd 100644
--- a/hiera/cowbird.yaml
+++ b/hiera/cowbird.yaml
@@ -78,8 +78,10 @@ mynetworks:
- "85.17.92.143"
name: cowbird
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
+rbls:
+ - zen.spamhaus.org
service_type: user_service
services:
- mx
diff --git a/hiera/deer.yaml b/hiera/deer.yaml
index 647c4e4..58d8392 100644
--- a/hiera/deer.yaml
+++ b/hiera/deer.yaml
@@ -26,8 +26,8 @@ mail:
- starfish.dev.bitmask.net
name: deer
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- tor
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 72f9102..c690c0f 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -26,8 +26,8 @@ mail:
- starfish.dev.bitmask.net
name: demodex
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- backup
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index 3370b51..3a3ce01 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -24,8 +24,8 @@ mail:
smarthost: []
name: diplocaulus
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- static
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 9982893..ca4ee54 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -1,5 +1,6 @@
---
api:
+ ca_cert_uri: "https://dev.bitmask.net/ca.crt"
domain: api.dev.bitmask.net
port: 4430
contacts:
@@ -184,8 +185,8 @@ nickserver:
domain: nicknym.dev.bitmask.net
port: 6425
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- webapp
@@ -307,6 +308,7 @@ webapp:
salt: 86497f034c8ef09b097f5c757ab038b7
username: webapp
customization_dir: /srv/leap/files/webapp/
+ default_locale: es
default_service_level: 1
domain: dev.bitmask.net
engines:
@@ -349,6 +351,8 @@ webapp:
- tickets
- vmail
- www-data
+ locales:
+ - es
modules:
- billing
- help
diff --git a/hiera/firefly.yaml b/hiera/firefly.yaml
index f9b0f0a..33c195d 100644
--- a/hiera/firefly.yaml
+++ b/hiera/firefly.yaml
@@ -26,8 +26,8 @@ mail:
- starfish.dev.bitmask.net
name: firefly
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- backup
diff --git a/hiera/goldeneye.yaml b/hiera/goldeneye.yaml
index 44016bd..0fdbc06 100644
--- a/hiera/goldeneye.yaml
+++ b/hiera/goldeneye.yaml
@@ -78,8 +78,8 @@ mail:
- cowbird.cdev.bitmask.net
name: goldeneye
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- couchdb
diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml
index 9163a7c..31accc9 100644
--- a/hiera/gorilla.yaml
+++ b/hiera/gorilla.yaml
@@ -82,8 +82,8 @@ mail:
smarthost: []
name: gorilla
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- couchdb
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index 1372b72..552677f 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -52,8 +52,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: user_service
services:
- openvpn
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 0a0c341..cec75f5 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -24,8 +24,8 @@ mail:
smarthost: []
name: ladybug
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- backup
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 5e26df0..a4d8757 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -90,8 +90,10 @@ mynetworks:
- "85.17.92.143"
name: leech
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
+rbls:
+ - zen.spamhaus.org
service_type: user_service
services:
- mx
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index b64ce3b..0f24b22 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -54,8 +54,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: user_service
services:
- openvpn
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 2ceb5e4..c31c464 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -82,8 +82,10 @@ mynetworks:
- "85.17.92.143"
name: mx1
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
+rbls:
+ - zen.spamhaus.org
service_type: user_service
services:
- mx
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index b3663bb..edfd58a 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -54,8 +54,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: user_service
services:
- openvpn
diff --git a/hiera/ovenbird.yaml b/hiera/ovenbird.yaml
index 79d2af2..7b6ba2b 100644
--- a/hiera/ovenbird.yaml
+++ b/hiera/ovenbird.yaml
@@ -1,5 +1,6 @@
---
api:
+ ca_cert_uri: "https://cdev.bitmask.net/ca.crt"
domain: api.cdev.bitmask.net
port: 4430
contacts:
@@ -154,8 +155,8 @@ nickserver:
domain: nicknym.cdev.bitmask.net
port: 6425
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- webapp
@@ -270,6 +271,7 @@ webapp:
salt: 1c1dd6eb78f027414f1638bd6c902a5a
username: webapp
customization_dir: /srv/leap/files/webapp/
+ default_locale: en
default_service_level: 1
domain: cdev.bitmask.net
engines:
@@ -312,6 +314,11 @@ webapp:
- tickets
- vmail
- www-data
+ locales:
+ - de
+ - en
+ - es
+ - pt
modules:
- billing
- help
diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml
index 2376b1a..d85b5d2 100644
--- a/hiera/plain1.yaml
+++ b/hiera/plain1.yaml
@@ -21,8 +21,8 @@ mail:
- mx1.bitmask.net
name: plain1
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services: []
sources:
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index 96ee15f..870d47e 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -52,8 +52,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: user_service
services:
- openvpn
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 962ca65..d837b82 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -51,8 +51,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: user_service
services:
- openvpn
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 03d1823..98c7b06 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -78,8 +78,10 @@ mynetworks:
- "85.17.92.143"
name: starfish
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
+rbls:
+ - zen.spamhaus.org
service_type: user_service
services:
- mx
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index bf8c6a3..3438198 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -86,8 +86,8 @@ mail:
- leech.demo.bitmask.net
name: thrips
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- couchdb
diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml
index 9c6fe23..02e2279 100644
--- a/hiera/tor1.yaml
+++ b/hiera/tor1.yaml
@@ -21,8 +21,8 @@ mail:
- mx1.bitmask.net
name: tor1
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: internal_service
services:
- tor
diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml
index d64a652..bc53621 100644
--- a/hiera/vpn1.yaml
+++ b/hiera/vpn1.yaml
@@ -51,8 +51,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: user_service
services:
- openvpn
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index edc79ac..823a921 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -1,5 +1,6 @@
---
api:
+ ca_cert_uri: "https://demo.bitmask.net/ca.crt"
domain: api.demo.bitmask.net
port: 4430
contacts:
@@ -116,6 +117,7 @@ definition_files:
}
},
"services": [
+ "= enabled_services",
"openvpn"
]
}
@@ -231,8 +233,8 @@ nickserver:
domain: nicknym.demo.bitmask.net
port: 6425
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- webapp
@@ -352,6 +354,7 @@ webapp:
salt: c632af58769857bcdf108b46da9eaa44
username: webapp
customization_dir: /srv/leap/files/webapp/
+ default_locale: en
default_service_level: 1
domain: demo.bitmask.net
engines:
@@ -394,6 +397,11 @@ webapp:
- tickets
- vmail
- www-data
+ locales:
+ - de
+ - en
+ - es
+ - pt
modules:
- billing
- help
diff --git a/hiera/web1.yaml b/hiera/web1.yaml
index 4f4fe79..46a9055 100644
--- a/hiera/web1.yaml
+++ b/hiera/web1.yaml
@@ -1,5 +1,6 @@
---
api:
+ ca_cert_uri: "https://bitmask.net/ca.crt"
domain: api.bitmask.net
port: 4430
contacts:
@@ -279,8 +280,8 @@ nickserver:
domain: nicknym.bitmask.net
port: 6425
platform:
- major_version: "0.7"
- version: "0.7.1"
+ major_version: "0.8"
+ version: "0.8"
service_type: public_service
services:
- monitor
@@ -411,6 +412,7 @@ webapp:
salt: 7e8868f8c4775290fd37d2f520d13672
username: webapp
customization_dir: /srv/leap/files/webapp/
+ default_locale: en
default_service_level: 1
domain: bitmask.net
engines:
@@ -453,6 +455,11 @@ webapp:
- tickets
- vmail
- www-data
+ locales:
+ - de
+ - en
+ - es
+ - pt
modules:
- billing
- help
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 09:25:19 +0000