summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
Diffstat (limited to 'hiera')
-rw-r--r--hiera/canvasback.yaml40
-rw-r--r--hiera/chameleon.yaml43
-rw-r--r--hiera/elephant.yaml43
-rw-r--r--hiera/hippo.yaml4
-rw-r--r--hiera/millipede.yaml1
-rw-r--r--hiera/rhino.yaml3
-rw-r--r--hiera/seahorse.yaml1
-rw-r--r--hiera/snail.yaml1
-rw-r--r--hiera/tor1.yaml2
-rw-r--r--hiera/vpn1.yaml1
-rw-r--r--hiera/wallaby.yaml43
-rw-r--r--hiera/web1.yaml43
12 files changed, 89 insertions, 136 deletions
diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml
index 5272d9f..724efe6 100644
--- a/hiera/canvasback.yaml
+++ b/hiera/canvasback.yaml
@@ -43,36 +43,17 @@ definition_files:
"allow_anonymous": true,
"allow_free": true,
"allow_limited_bandwidth": false,
- "allow_paid": true,
+ "allow_paid": false,
"allow_registration": true,
"allow_unlimited_bandwidth": true,
"bandwidth_limit": 102400,
"default_service_level": 1,
- "levels": [
- {
- "id": 1,
- "name": "free",
- "storage": 50
- },
- {
- "id": 2,
- "name": "basic",
- "rate": [
- "US$10",
- "€10"
- ],
- "storage": 1000
- },
- {
- "id": 3,
- "name": "pro",
- "rate": [
- "US$20",
- "€20"
- ],
- "storage": 10000
+ "levels": {
+ "1": {
+ "description": "Please donate.",
+ "name": "free"
}
- ]
+ }
},
"services": [
"mx"
@@ -124,8 +105,8 @@ development:
site_config: true
dns:
aliases:
- - cdev.bitmask.net
- canvasback.cdev.bitmask.net
+ - cdev.bitmask.net
- api.cdev.bitmask.net
- nicknym.cdev.bitmask.net
public: true
@@ -248,6 +229,8 @@ webapp:
salt: 1c1dd6eb78f027414f1638bd6c902a5a
username: webapp
customization_dir: /etc/leap/files/webapp/
+ default_service_level: 1
+ domain: cdev.bitmask.net
git:
revision: origin/develop
source: "https://leap.se/git/leap_web"
@@ -260,6 +243,11 @@ webapp:
username: nagios_test
secret_token: MwScfJR7TbrkhSbsYIkMLuac55J48rnt
secure: false
+ service_levels:
+ ? "1"
+ :
+ description: "Please donate."
+ name: free
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 21e5dcd..46b5d3f 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -42,7 +42,8 @@ definition_files:
"auth": "SHA1",
"cipher": "AES-128-CBC",
"keepalive": "10 30",
- "tls-cipher": "DHE-RSA-AES128-SHA"
+ "tls-cipher": "DHE-RSA-AES128-SHA",
+ "tun-ipv6": true
},
"serial": 1,
"version": 1
@@ -73,36 +74,17 @@ definition_files:
"allow_anonymous": true,
"allow_free": true,
"allow_limited_bandwidth": false,
- "allow_paid": true,
+ "allow_paid": false,
"allow_registration": true,
"allow_unlimited_bandwidth": true,
"bandwidth_limit": 102400,
"default_service_level": 1,
- "levels": [
- {
- "id": 1,
- "name": "free",
- "storage": 50
- },
- {
- "id": 2,
- "name": "basic",
- "rate": [
- "US$10",
- "€10"
- ],
- "storage": 1000
- },
- {
- "id": 3,
- "name": "pro",
- "rate": [
- "US$20",
- "€20"
- ],
- "storage": 10000
+ "levels": {
+ "1": {
+ "description": "Please donate.",
+ "name": "free"
}
- ]
+ }
},
"services": [
"mx",
@@ -155,8 +137,8 @@ development:
site_config: true
dns:
aliases:
- - unstable.bitmask.net
- chameleon.unstable.bitmask.net
+ - unstable.bitmask.net
- api.unstable.bitmask.net
- nicknym.unstable.bitmask.net
public: true
@@ -577,6 +559,8 @@ webapp:
salt: 478bf7e8ca879a9711b279055f00153e
username: webapp
customization_dir: /etc/leap/files/webapp/
+ default_service_level: 1
+ domain: unstable.bitmask.net
git:
revision: origin/develop
source: "https://leap.se/git/leap_web"
@@ -589,6 +573,11 @@ webapp:
username: nagios_test
secret_token: aC9zAs6X5YE_9EC_RQckGCFkKfJ4vTAJ
secure: false
+ service_levels:
+ ? "1"
+ :
+ description: "Please donate."
+ name: free
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 67f897b..1b1380a 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -42,7 +42,8 @@ definition_files:
"auth": "SHA1",
"cipher": "AES-128-CBC",
"keepalive": "10 30",
- "tls-cipher": "DHE-RSA-AES128-SHA"
+ "tls-cipher": "DHE-RSA-AES128-SHA",
+ "tun-ipv6": true
},
"serial": 1,
"version": 1
@@ -73,36 +74,17 @@ definition_files:
"allow_anonymous": false,
"allow_free": true,
"allow_limited_bandwidth": false,
- "allow_paid": true,
+ "allow_paid": false,
"allow_registration": true,
"allow_unlimited_bandwidth": true,
"bandwidth_limit": 102400,
"default_service_level": 1,
- "levels": [
- {
- "id": 1,
- "name": "free",
- "storage": 50
- },
- {
- "id": 2,
- "name": "basic",
- "rate": [
- "US$10",
- "€10"
- ],
- "storage": 1000
- },
- {
- "id": 3,
- "name": "pro",
- "rate": [
- "US$20",
- "€20"
- ],
- "storage": 10000
+ "levels": {
+ "1": {
+ "description": "Please donate.",
+ "name": "free"
}
- ]
+ }
},
"services": [
"mx",
@@ -161,8 +143,8 @@ development:
site_config: true
dns:
aliases:
- - dev.bitmask.net
- elephant.dev.bitmask.net
+ - dev.bitmask.net
- api.dev.bitmask.net
- nicknym.dev.bitmask.net
public: true
@@ -320,6 +302,8 @@ webapp:
salt: 86497f034c8ef09b097f5c757ab038b7
username: webapp
customization_dir: /etc/leap/files/webapp/
+ default_service_level: 1
+ domain: dev.bitmask.net
git:
revision: origin/develop
source: "https://leap.se/git/leap_web"
@@ -332,6 +316,11 @@ webapp:
username: nagios_test
secret_token: _DLZ7e9YhU_d3HDCWFzCMd3WnC4QaP__
secure: false
+ service_levels:
+ ? "1"
+ :
+ description: "Please donate."
+ name: free
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index 7dc721d..5803686 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -33,6 +33,7 @@ openvpn:
cipher: AES-128-CBC
keepalive: "10 30"
tls-cipher: DHE-RSA-AES128-SHA
+ tun-ipv6: true
filter_dns: false
gateway_address: "85.17.92.167"
limited_prefix: LIMITED
@@ -92,7 +93,8 @@ tor:
bandwidth_rate: 100
contacts:
- sysdev@leap.se
- nickname: hippo
+ family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG"
+ nickname: hippobagtc8Z3KPmfnT
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 43ea763..3a5b0bf 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -33,6 +33,7 @@ openvpn:
cipher: AES-128-CBC
keepalive: "10 30"
tls-cipher: DHE-RSA-AES128-SHA
+ tun-ipv6: true
filter_dns: false
gateway_address: "198.252.153.84"
limited_prefix: LIMITED
diff --git a/hiera/rhino.yaml b/hiera/rhino.yaml
index f5da85d..0b6204d 100644
--- a/hiera/rhino.yaml
+++ b/hiera/rhino.yaml
@@ -70,7 +70,8 @@ tor:
bandwidth_rate: 100
contacts:
- sysdev@leap.se
- nickname: rhino
+ family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG"
+ nickname: rhinouSaR9IekHdQGUG
type: relay
x509:
ca_cert: |
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index f6ff828..5cd0f46 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -33,6 +33,7 @@ openvpn:
cipher: AES-128-CBC
keepalive: "10 30"
tls-cipher: DHE-RSA-AES128-SHA
+ tun-ipv6: true
filter_dns: false
gateway_address: "199.119.112.13"
limited_prefix: LIMITED
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 0d1802c..c6a7d63 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -34,6 +34,7 @@ openvpn:
cipher: AES-128-CBC
keepalive: "10 30"
tls-cipher: DHE-RSA-AES128-SHA
+ tun-ipv6: true
filter_dns: true
gateway_address: "176.53.69.19"
limited_prefix: LIMITED
diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml
index 5feb794..0a57d79 100644
--- a/hiera/tor1.yaml
+++ b/hiera/tor1.yaml
@@ -66,6 +66,8 @@ tor:
bandwidth_rate: 6550
contacts:
- sysdev@leap.se
+ family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG"
+ nickname: tor1pPXtPbHH5BVHVE2
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml
index afcf903..5825a5c 100644
--- a/hiera/vpn1.yaml
+++ b/hiera/vpn1.yaml
@@ -30,6 +30,7 @@ openvpn:
cipher: AES-128-CBC
keepalive: "10 30"
tls-cipher: DHE-RSA-AES128-SHA
+ tun-ipv6: true
filter_dns: true
free_gateway_address: "10.5.5.47"
gateway_address: "10.5.5.46"
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 0d50322..a1081ff 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -69,7 +69,8 @@ definition_files:
"auth": "SHA1",
"cipher": "AES-128-CBC",
"keepalive": "10 30",
- "tls-cipher": "DHE-RSA-AES128-SHA"
+ "tls-cipher": "DHE-RSA-AES128-SHA",
+ "tun-ipv6": true
},
"serial": 1,
"version": 1
@@ -98,36 +99,17 @@ definition_files:
"allow_anonymous": true,
"allow_free": true,
"allow_limited_bandwidth": false,
- "allow_paid": true,
+ "allow_paid": false,
"allow_registration": true,
"allow_unlimited_bandwidth": true,
"bandwidth_limit": 102400,
"default_service_level": 1,
- "levels": [
- {
- "id": 1,
- "name": "free",
- "storage": 50
- },
- {
- "id": 2,
- "name": "basic",
- "rate": [
- "US$10",
- "€10"
- ],
- "storage": 1000
- },
- {
- "id": 3,
- "name": "pro",
- "rate": [
- "US$20",
- "€20"
- ],
- "storage": 10000
+ "levels": {
+ "1": {
+ "description": "Please donate.",
+ "name": "free"
}
- ]
+ }
},
"services": [
"openvpn"
@@ -179,8 +161,8 @@ development:
site_config: true
dns:
aliases:
- - demo.bitmask.net
- wallaby.demo.bitmask.net
+ - demo.bitmask.net
- api.demo.bitmask.net
- nicknym.demo.bitmask.net
public: true
@@ -317,6 +299,8 @@ webapp:
salt: c632af58769857bcdf108b46da9eaa44
username: webapp
customization_dir: /etc/leap/files/webapp/
+ default_service_level: 1
+ domain: demo.bitmask.net
git:
revision: origin/develop
source: "https://leap.se/git/leap_web"
@@ -329,6 +313,11 @@ webapp:
username: nagios_test
secret_token: GgKvW3NhAKwgvQuMAzdHhLDBh3g3u5Xd
secure: true
+ service_levels:
+ ? "1"
+ :
+ description: "Please donate."
+ name: free
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/web1.yaml b/hiera/web1.yaml
index e8bf72f..b207b89 100644
--- a/hiera/web1.yaml
+++ b/hiera/web1.yaml
@@ -36,7 +36,8 @@ definition_files:
"auth": "SHA1",
"cipher": "AES-128-CBC",
"keepalive": "10 30",
- "tls-cipher": "DHE-RSA-AES128-SHA"
+ "tls-cipher": "DHE-RSA-AES128-SHA",
+ "tun-ipv6": true
},
"serial": 1,
"version": 1
@@ -67,36 +68,17 @@ definition_files:
"allow_anonymous": false,
"allow_free": true,
"allow_limited_bandwidth": false,
- "allow_paid": true,
+ "allow_paid": false,
"allow_registration": true,
"allow_unlimited_bandwidth": true,
"bandwidth_limit": 102400,
"default_service_level": 1,
- "levels": [
- {
- "id": 1,
- "name": "free",
- "storage": 50
- },
- {
- "id": 2,
- "name": "basic",
- "rate": [
- "US$10",
- "€10"
- ],
- "storage": 1000
- },
- {
- "id": 3,
- "name": "pro",
- "rate": [
- "US$20",
- "€20"
- ],
- "storage": 10000
+ "levels": {
+ "1": {
+ "description": "Please donate.",
+ "name": "free"
}
- ]
+ }
},
"services": [
"mx",
@@ -142,8 +124,8 @@ development:
site_config: true
dns:
aliases:
- - bitmask.net
- web1.bitmask.net
+ - bitmask.net
- api.bitmask.net
- nicknym.bitmask.net
public: true
@@ -273,6 +255,8 @@ webapp:
salt: 7e8868f8c4775290fd37d2f520d13672
username: webapp
customization_dir: /etc/leap/files/webapp/
+ default_service_level: 1
+ domain: bitmask.net
git:
revision: origin/develop
source: "https://leap.se/git/leap_web"
@@ -285,6 +269,11 @@ webapp:
username: nagios_test
secret_token: btsFN6UD9nfP4SAWDYMmuMkgRTL5WW7E
secure: false
+ service_levels:
+ ? "1"
+ :
+ description: "Please donate."
+ name: free
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 21:10:10 +0000