summaryrefslogtreecommitdiff
path: root/hiera/lynx.yaml
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-04-25 19:32:11 -0400
committerMicah Anderson <micah@riseup.net>2017-04-25 19:32:11 -0400
commitb69dde3981d93d3e2585de4b47ac74baa1c33830 (patch)
tree96a47a223108e9470e1a6525dc3e1ddf02d533f4 /hiera/lynx.yaml
parentd4171c00773e1ca8b05cf9c1be23d1227d9bd9af (diff)
switch demo to demovpn and add a demomail tag/environment
Diffstat (limited to 'hiera/lynx.yaml')
-rw-r--r--hiera/lynx.yaml15
1 files changed, 4 insertions, 11 deletions
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index 79243e9..8f8ec45 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -14,6 +14,7 @@ couchdb_leap_mx_user:
password: HJXaTzM5gChwwr5Ur3epyacegvXNIDYK
salt: b80d3038cfaa3bd0802dc140752d0dc6
username: leap_mx
+couchdb_port: 4000
definition_files:
eip_service: |-
{
@@ -142,16 +143,6 @@ firewall:
- 6425
- 80
to: "37.218.242.146"
-haproxy:
- couch:
- listen_port: 4096
- servers:
- giraffe:
- backup: false
- host: localhost
- port: 4000
- weight: 100
- writable: true
hosts:
giraffe:
domain_full: giraffe.cdev.bitmask.net
@@ -237,7 +228,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-0.9"
+ basic: "http://deb.leap.se/experimental-platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
@@ -347,6 +339,7 @@ webapp:
password: abVQmkZubeAvncgcVSYRD4_pHANEItWb
salt: a5a58ff4365be3113f19014ea3050129
username: admin
+ couchdb_port: 4000
couchdb_webapp_user:
password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t
salt: 1c1dd6eb78f027414f1638bd6c902a5a