summaryrefslogtreecommitdiff
path: root/hiera/millipede.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/millipede.yaml
parentd4171c00773e1ca8b05cf9c1be23d1227d9bd9af (diff)
switch demo to demovpn and add a demomail tag/environment
Diffstat (limited to 'hiera/millipede.yaml')
-rw-r--r--hiera/millipede.yaml21
1 files changed, 11 insertions, 10 deletions
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index d2af465..cf3daae 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -13,7 +13,7 @@ domain:
internal_suffix: demo.bitmask.i
name: millipede.demo.bitmask.net
enabled: true
-environment: demo
+environment: demovpn
firewall:
ssh:
from: sysadmin
@@ -23,7 +23,7 @@ firewall:
vpn:
from: "*"
port:
- - 22642
+ - 19345
- "443"
to: "198.252.153.84"
hosts: {}
@@ -39,8 +39,8 @@ name: millipede
obfsproxy:
gateway_address: "198.252.153.84"
scramblesuit:
- password: LBRG2TCRGVGFE42NLFJTM5SUKI2DIVCX
- port: 22642
+ password: OJUDKRKLMZJXIM3UNBTXMODRKJSVI4TT
+ port: 19345
openvpn:
adblock: false
allow_limited: false
@@ -64,8 +64,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.9"
- version: "0.9"
+ major_version: "0.10"
+ version: "0.10"
service_type: user_service
services:
- openvpn
@@ -79,18 +79,19 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/version/0.9
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
type: apt
webapp:
- revision: origin/version/0.8
+ revision: origin/master
source: "https://leap.se/git/leap_web"
type: git
ssh:
@@ -147,7 +148,7 @@ stunnel:
clients: {}
servers: {}
tags:
- - demo
+ - demovpn
- seattle
x509:
ca_cert: |