summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-08 18:24:14 +0200
committervarac <varacanero@zeromail.org>2015-04-08 18:24:14 +0200
commit9f0d7d262324d64fa5143cfd34e7b3d4987391f5 (patch)
treef8dbf0d76f4a68be8c3ddbcf5dd192a7f82faf38 /hiera
parent287f817df918efe48e6f8677e066ff34804aa22f (diff)
bump platform version to 0.6.1
Diffstat (limited to 'hiera')
-rw-r--r--hiera/chameleon.yaml13
-rw-r--r--hiera/koala.yaml8
-rw-r--r--hiera/octopus.yaml8
-rw-r--r--hiera/panda.yaml8
-rw-r--r--hiera/seahorse.yaml10
5 files changed, 25 insertions, 22 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index ebb658d..40bc2b5 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -42,7 +42,6 @@ definition_files:
"openvpn_configuration": {
"auth": "SHA1",
"cipher": "AES-128-CBC",
- "fragment": 1400,
"keepalive": "10 30",
"tls-cipher": "DHE-RSA-AES128-SHA",
"tun-ipv6": true
@@ -641,8 +640,8 @@ nickserver:
domain: nicknym.unstable.bitmask.net
port: 6425
platform:
- major_version: "0.6"
- version: "0.6.1"
+ major_version: "0.7"
+ version: "0.7"
service_type: public_service
services:
- monitor
@@ -665,11 +664,11 @@ sources:
revision: latest
type: apt
tapicero:
- revision: origin/version/0.6.1
+ revision: origin/version/0.7
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.6
+ revision: origin/version/0.7
source: "https://leap.se/git/leap_web"
type: git
ssh:
@@ -765,6 +764,10 @@ webapp:
client_version:
max: ~
min: "0.7"
+ couchdb_admin_user:
+ password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
+ salt: b9d35fd378ba1598e843d5a784cfdf7e
+ username: admin
couchdb_webapp_user:
password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew
salt: 478bf7e8ca879a9711b279055f00153e
diff --git a/hiera/koala.yaml b/hiera/koala.yaml
index 00d1398..9a942f2 100644
--- a/hiera/koala.yaml
+++ b/hiera/koala.yaml
@@ -85,8 +85,8 @@ mail:
- octopus.unstable.bitmask.net
name: koala
platform:
- major_version: "0.6"
- version: "0.6.1"
+ major_version: "0.7"
+ version: "0.7"
service_type: internal_service
services:
- couchdb
@@ -108,11 +108,11 @@ sources:
revision: latest
type: apt
tapicero:
- revision: origin/version/0.6.1
+ revision: origin/version/0.7
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.6
+ revision: origin/version/0.7
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index 834887b..e1bea8a 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -100,8 +100,8 @@ mynetworks:
- "85.17.92.143"
name: octopus
platform:
- major_version: "0.6"
- version: "0.6.1"
+ major_version: "0.7"
+ version: "0.7"
service_type: user_service
services:
- mx
@@ -123,11 +123,11 @@ sources:
revision: latest
type: apt
tapicero:
- revision: origin/version/0.6.1
+ revision: origin/version/0.7
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.6
+ revision: origin/version/0.7
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/panda.yaml b/hiera/panda.yaml
index e36b78c..75299fb 100644
--- a/hiera/panda.yaml
+++ b/hiera/panda.yaml
@@ -86,8 +86,8 @@ mail:
- octopus.unstable.bitmask.net
name: panda
platform:
- major_version: "0.6"
- version: "0.6.1"
+ major_version: "0.7"
+ version: "0.7"
service_type: public_service
services:
- couchdb
@@ -117,11 +117,11 @@ sources:
revision: latest
type: apt
tapicero:
- revision: origin/version/0.6.1
+ revision: origin/version/0.7
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.6
+ revision: origin/version/0.7
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index 88975e8..09fc7e0 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -37,7 +37,7 @@ openvpn:
configuration:
auth: SHA1
cipher: AES-128-CBC
- fragment: 1400
+ fragment: 1500
keepalive: "10 30"
tls-cipher: DHE-RSA-AES128-SHA
tun-ipv6: true
@@ -54,8 +54,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.6"
- version: "0.6.1"
+ major_version: "0.7"
+ version: "0.7"
service_type: user_service
services:
- openvpn
@@ -77,11 +77,11 @@ sources:
revision: latest
type: apt
tapicero:
- revision: origin/version/0.6.1
+ revision: origin/version/0.7
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.6
+ revision: origin/version/0.7
source: "https://leap.se/git/leap_web"
type: git
ssh: