summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hiera/aardwolf.yaml3
-rw-r--r--hiera/cat.yaml3
-rw-r--r--hiera/donkey.yaml3
-rw-r--r--hiera/quetzal.yaml7
-rw-r--r--hiera/tuatara.yaml3
-rw-r--r--nodes/aardwolf.json7
-rw-r--r--nodes/cat.json9
-rw-r--r--nodes/donkey.json9
-rw-r--r--nodes/quetzal.json9
-rw-r--r--nodes/tuatara.json9
10 files changed, 54 insertions, 8 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 13289ee..f252d40 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -95,6 +95,9 @@ sources:
revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
+ platform:
+ apt:
+ basic: "http://deb.leap.se/experimental-0.8"
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index a014b65..c29a83e 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -116,6 +116,9 @@ sources:
revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
+ platform:
+ apt:
+ basic: "http://deb.leap.se/experimental-0.8"
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index a576f2c..9dbfc28 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -703,6 +703,9 @@ sources:
revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
+ platform:
+ apt:
+ basic: "http://deb.leap.se/experimental-0.8"
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/quetzal.yaml b/hiera/quetzal.yaml
index 4a0aed0..d9d9de4 100644
--- a/hiera/quetzal.yaml
+++ b/hiera/quetzal.yaml
@@ -241,8 +241,8 @@ nickserver:
domain: nicknym.jessie.bitmask.net
port: 6425
platform:
- major_version: "0.9"
- version: "0.9"
+ major_version: "0.8"
+ version: "0.8"
rbls:
- zen.spamhaus.org
service_type: public_service
@@ -273,6 +273,9 @@ sources:
revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
+ platform:
+ apt:
+ basic: "http://deb.leap.se/experimental-0.8"
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 8c7e5ff..60950ae 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -83,6 +83,9 @@ sources:
revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
+ platform:
+ apt:
+ basic: "http://deb.leap.se/experimental-0.8"
soledad:
package: soledad-server
revision: latest
diff --git a/nodes/aardwolf.json b/nodes/aardwolf.json
index 78dd41e..9bd392d 100644
--- a/nodes/aardwolf.json
+++ b/nodes/aardwolf.json
@@ -8,6 +8,13 @@
"dc",
"unstable"
],
+ "sources": {
+ "platform": {
+ "apt": {
+ "basic": "http://deb.leap.se/experimental-0.8"
+ }
+ }
+ },
"couch": {
"master": true,
"pwhash_alg": "pbkdf2"
diff --git a/nodes/cat.json b/nodes/cat.json
index 11bb982..5a9b055 100644
--- a/nodes/cat.json
+++ b/nodes/cat.json
@@ -1,5 +1,12 @@
{
"ip_address": "199.119.112.123",
"services": "mx",
- "tags": ["unstable", "dc"]
+ "tags": ["unstable", "dc"],
+ "sources": {
+ "platform": {
+ "apt": {
+ "basic": "http://deb.leap.se/experimental-0.8"
+ }
+ }
+ }
}
diff --git a/nodes/donkey.json b/nodes/donkey.json
index 2271348..6870d48 100644
--- a/nodes/donkey.json
+++ b/nodes/donkey.json
@@ -9,5 +9,12 @@
"dc",
"sandbox-braintree",
"unstable"
- ]
+ ],
+ "sources": {
+ "platform": {
+ "apt": {
+ "basic": "http://deb.leap.se/experimental-0.8"
+ }
+ }
+ }
}
diff --git a/nodes/quetzal.json b/nodes/quetzal.json
index 31178eb..b25d928 100644
--- a/nodes/quetzal.json
+++ b/nodes/quetzal.json
@@ -3,9 +3,12 @@
"environment": "jessie",
"tags": ["jessie", "dc"],
"services": ["webapp", "couchdb", "mx", "soledad"],
- "platform": {
- "major_version": "0.9",
- "version": "0.9"
+ "sources": {
+ "platform": {
+ "apt": {
+ "basic": "http://deb.leap.se/experimental-0.8"
+ }
+ }
},
"couch": {
"master": true,
diff --git a/nodes/tuatara.json b/nodes/tuatara.json
index 12042a0..b861ff6 100644
--- a/nodes/tuatara.json
+++ b/nodes/tuatara.json
@@ -7,5 +7,12 @@
"tags": [
"dc",
"unstable"
- ]
+ ],
+ "sources": {
+ "platform": {
+ "apt": {
+ "basic": "http://deb.leap.se/experimental-0.8"
+ }
+ }
+ }
}