summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2017-01-08 11:55:23 -0800
committerelijah <elijah@riseup.net>2017-01-08 11:55:23 -0800
commit23b133ae4385f2b725255ae5fc329803273ffbd2 (patch)
tree84fa7974e542e1254d6cca05ef5a7650416376d9 /hiera
parent31df3b8e39e13635c222c347892ca0dafc5669d8 (diff)
pin demo.bitmask.net to use version/0.9.x platform
Diffstat (limited to 'hiera')
-rw-r--r--hiera/ant.yaml12
-rw-r--r--hiera/leech.yaml14
-rw-r--r--hiera/millipede.yaml12
-rw-r--r--hiera/otter.yaml12
4 files changed, 25 insertions, 25 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 3c22488..5e79950 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -75,8 +75,8 @@ mail:
smarthost: []
name: ant
platform:
- major_version: "0.10"
- version: "0.10"
+ major_version: "0.9"
+ version: "0.9"
service_type: public_service
services:
- couchdb
@@ -99,18 +99,18 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.9
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/0.9"
soledad:
package: soledad-server
revision: latest
type: apt
webapp:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/leap_web"
type: git
ssh:
@@ -143,7 +143,7 @@ ssh:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
type: ssh-rsa
meskio:
- key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
type: ssh-rsa
micah:
key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 9b15168..64a8e71 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -217,8 +217,8 @@ nickserver:
domain: nicknym.demo.bitmask.net
port: 6425
platform:
- major_version: "0.10"
- version: "0.10"
+ major_version: "0.9"
+ version: "0.9"
service_type: public_service
services:
- webapp
@@ -232,18 +232,18 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.9
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/0.9"
soledad:
package: soledad-server
revision: latest
type: apt
webapp:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/leap_web"
type: git
ssh:
@@ -276,7 +276,7 @@ ssh:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
type: ssh-rsa
meskio:
- key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
type: ssh-rsa
micah:
key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
@@ -339,7 +339,7 @@ webapp:
unlimited_prefix: UNLIMITED
client_version:
max: ~
- min: "0.9.4"
+ min: "0.7"
couchdb_admin_user:
password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
salt: e1dca99375c513be477295f141b9f032
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index aa7c731..d2af465 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -64,8 +64,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.10"
- version: "0.10"
+ major_version: "0.9"
+ version: "0.9"
service_type: user_service
services:
- openvpn
@@ -79,18 +79,18 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.9
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/0.9"
soledad:
package: soledad-server
revision: latest
type: apt
webapp:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/leap_web"
type: git
ssh:
@@ -123,7 +123,7 @@ ssh:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
type: ssh-rsa
meskio:
- key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
type: ssh-rsa
micah:
key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 458e4d7..6340e7c 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -64,8 +64,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.10"
- version: "0.10"
+ major_version: "0.9"
+ version: "0.9"
service_type: user_service
services:
- openvpn
@@ -80,18 +80,18 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.9
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/0.9"
soledad:
package: soledad-server
revision: latest
type: apt
webapp:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/leap_web"
type: git
ssh:
@@ -124,7 +124,7 @@ ssh:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
type: ssh-rsa
meskio:
- key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
type: ssh-rsa
micah:
key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==