summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hiera/aardwolf.yaml2
-rw-r--r--hiera/ant.yaml1
-rw-r--r--hiera/cat.yaml2
-rw-r--r--hiera/clam.yaml3
-rw-r--r--hiera/demodex.yaml3
-rw-r--r--hiera/donkey.yaml6
-rw-r--r--hiera/dotterel.yaml4
-rw-r--r--hiera/elephant.yaml7
-rw-r--r--hiera/giraffe.yaml2
-rw-r--r--hiera/leech.yaml1
-rw-r--r--hiera/lynx.yaml6
-rw-r--r--hiera/millipede.yaml1
-rw-r--r--hiera/newt.yaml3
-rw-r--r--hiera/orangutan.yaml4
-rw-r--r--hiera/otter.yaml2
-rw-r--r--hiera/snail.yaml3
-rw-r--r--hiera/tuatara.yaml2
-rw-r--r--provider.demomail.json3
-rw-r--r--provider.demovpn.json1
-rw-r--r--provider.json2
-rw-r--r--services/webapp.unstable.json5
21 files changed, 23 insertions, 40 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index d9cc9cd..b174a3e 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -107,7 +107,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 606976b..63206b3 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - elijah@leap.se
- sysdev@leap.se
couch:
mode: plain
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index dd9d491..cde4ade 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -111,7 +111,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 765afe0..3b919f1 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - micah@leap.se
- sysdev@leap.se
couch:
mode: plain
@@ -107,7 +106,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 8bc4863..5804cb8 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - micah@leap.se
- sysdev@leap.se
development:
site_config: true
@@ -48,7 +47,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 1ca4f67..c1be69f 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -63,7 +63,7 @@ definition_files:
"es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios."
},
"domain": "unstable.bitmask.net",
- "enrollment_policy": "open",
+ "enrollment_policy": "invite",
"languages": [
"de",
"en",
@@ -343,11 +343,9 @@ nagios:
- sysdev@leap.se
demovpn:
contact_emails:
- - elijah@leap.se
- sysdev@leap.se
development:
contact_emails:
- - micah@leap.se
- sysdev@leap.se
production:
contact_emails:
@@ -574,7 +572,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
index c67196d..c437183 100644
--- a/hiera/dotterel.yaml
+++ b/hiera/dotterel.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - micah@leap.se
- sysdev@leap.se
development:
site_config: true
@@ -48,7 +47,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
@@ -128,7 +127,6 @@ tags:
tor:
bandwidth_rate: 100
contacts:
- - micah@leap.se
- sysdev@leap.se
family: "dottereluSaR9IekHdQ,otterdVuPt9yFz8SpKm"
hidden_service:
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 8f9ae79..ace2c8e 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -6,7 +6,6 @@ api:
uri: "https://api.dev.bitmask.net:4430/1"
version: 1
contacts:
- - micah@leap.se
- sysdev@leap.se
definition_files:
eip_service: |-
@@ -64,7 +63,7 @@ definition_files:
"es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios."
},
"domain": "dev.bitmask.net",
- "enrollment_policy": "open",
+ "enrollment_policy": "invite",
"languages": [
"es"
],
@@ -212,7 +211,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
@@ -382,7 +381,7 @@ webapp:
- tickets
- vmail
- www-data
- invite_required: false
+ invite_required: true
locales:
- es
modules:
diff --git a/hiera/giraffe.yaml b/hiera/giraffe.yaml
index cbad144..6f89bee 100644
--- a/hiera/giraffe.yaml
+++ b/hiera/giraffe.yaml
@@ -106,7 +106,7 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
component: master
soledad:
package: soledad-server
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 90d6dcd..9809378 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -6,7 +6,6 @@ api:
uri: "https://api.demo.bitmask.net:4430/1"
version: 1
contacts:
- - elijah@leap.se
- sysdev@leap.se
definition_files:
eip_service: |-
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index 25332c6..db6a491 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -34,7 +34,7 @@ definition_files:
"es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios."
},
"domain": "cdev.bitmask.net",
- "enrollment_policy": "open",
+ "enrollment_policy": "invite",
"languages": [
"de",
"en",
@@ -229,7 +229,7 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
component: master
soledad:
package: soledad-server
@@ -395,7 +395,7 @@ webapp:
- tickets
- vmail
- www-data
- invite_required: false
+ invite_required: true
locales:
- de
- en
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 5ddb35d..4637e80 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - elijah@leap.se
- sysdev@leap.se
development:
site_config: true
diff --git a/hiera/newt.yaml b/hiera/newt.yaml
index 10a0bd5..5dfc9df 100644
--- a/hiera/newt.yaml
+++ b/hiera/newt.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - micah@leap.se
- sysdev@leap.se
development:
site_config: true
@@ -48,7 +47,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index 4100747..751401b 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -63,7 +63,7 @@ definition_files:
"es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios."
},
"domain": "singlenode.bitmask.net",
- "enrollment_policy": "open",
+ "enrollment_policy": "invite",
"languages": [
"de",
"en",
@@ -429,7 +429,7 @@ webapp:
- tickets
- vmail
- www-data
- invite_required: false
+ invite_required: true
locales:
- de
- en
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 9410959..33ba6e6 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -1,6 +1,5 @@
---
contacts:
- - elijah@leap.se
- sysdev@leap.se
development:
site_config: true
@@ -161,7 +160,6 @@ tags:
tor:
bandwidth_rate: 100
contacts:
- - elijah@leap.se
- sysdev@leap.se
family: "dottereluSaR9IekHdQ,otterdVuPt9yFz8SpKm"
hidden_service:
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index fcd283b..b229b36 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -2,7 +2,6 @@
clamav:
whitelisted_addresses: []
contacts:
- - micah@leap.se
- sysdev@leap.se
couchdb_leap_mx_user:
password: TISmwrYwSBmwbdDyQvJYu3_VkZmfZITc
@@ -147,7 +146,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 2eef59f..10aac6f 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -80,7 +80,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: master
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/provider.demomail.json b/provider.demomail.json
index 65f0bcf..d17be64 100644
--- a/provider.demomail.json
+++ b/provider.demomail.json
@@ -1,3 +1,4 @@
{
- "domain": "mail.bitmask.net"
+ "domain": "mail.bitmask.net",
+ "enrollment_policy": "open"
}
diff --git a/provider.demovpn.json b/provider.demovpn.json
index e4d6de4..873b771 100644
--- a/provider.demovpn.json
+++ b/provider.demovpn.json
@@ -12,6 +12,7 @@
"allow_anonymous": true,
"levels": {}
},
+ "enrollment_policy": "open",
"client_version": {
"max": null,
"min": "0.9"
diff --git a/provider.json b/provider.json
index 4999ede..efc97ff 100644
--- a/provider.json
+++ b/provider.json
@@ -13,7 +13,7 @@
},
"languages": ["en", "es", "pt", "de"],
"default_language": "en",
- "enrollment_policy": "open",
+ "enrollment_policy": "invite",
"contacts": {
"default": "sysdev@leap.se"
},
diff --git a/services/webapp.unstable.json b/services/webapp.unstable.json
deleted file mode 100644
index d560743..0000000
--- a/services/webapp.unstable.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "webapp": {
- "invite_required": true
- }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:11:11 +0000