From b69dde3981d93d3e2585de4b47ac74baa1c33830 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 25 Apr 2017 19:32:11 -0400 Subject: switch demo to demovpn and add a demomail tag/environment --- hiera/millipede.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'hiera/millipede.yaml') 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: | -- cgit v1.2.3