leap compile for all envs

21 files changed, 73 insertions, 85 deletions

diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index b752965..ef8861d 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -86,7 +86,7 @@ mail:
 name: ant
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: internal_service
 services: 
   - couchdb
@@ -112,7 +112,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml
index 5ad8ed4..ae4440d 100644
--- a/hiera/armadillo.yaml
+++ b/hiera/armadillo.yaml
@@ -83,7 +83,7 @@ mail:
 name: armadillo
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: internal_service
 services: 
   - couchdb
@@ -109,7 +109,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml
index c118d32..dba8d59 100644
--- a/hiera/canvasback.yaml
+++ b/hiera/canvasback.yaml
@@ -154,7 +154,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - webapp
@@ -180,7 +180,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml
index fdcea5a..60a4012 100644
--- a/hiera/chipmonk.yaml
+++ b/hiera/chipmonk.yaml
@@ -56,28 +56,25 @@ mynetworks:
   - "176.53.69.14"
   - "176.53.69.22"
   - "176.53.69.23"
-  - "192.168.5.10"
   - "192.168.5.12"
-  - "192.168.5.16"
   - "192.168.5.19"
-  - "192.168.5.23"
   - "192.168.5.4"
   - "192.168.5.5"
   - "192.168.5.8"
-  - "192.168.5.9"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.10"
   - "199.119.112.12"
+  - "199.119.112.123"
   - "199.119.112.124"
-  - "199.119.112.16"
+  - "199.119.112.133"
+  - "199.119.112.147"
+  - "199.119.112.149"
+  - "199.119.112.150"
   - "199.119.112.19"
-  - "199.119.112.23"
   - "199.119.112.4"
   - "199.119.112.5"
   - "199.119.112.8"
-  - "199.119.112.9"
   - "202.85.233.34"
   - "204.13.164.162"
   - "204.13.164.171"
@@ -87,7 +84,7 @@ mynetworks:
 name: chipmonk
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - mx
@@ -113,7 +110,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml
index 37171df..86b7091 100644
--- a/hiera/couch1.yaml
+++ b/hiera/couch1.yaml
@@ -78,7 +78,7 @@ mail:
 name: couch1
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - couchdb
@@ -112,7 +112,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml
index 1660341..7ae7c37 100644
--- a/hiera/couch2.yaml
+++ b/hiera/couch2.yaml
@@ -78,7 +78,7 @@ mail:
 name: couch2
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - couchdb
@@ -112,7 +112,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml
index 48c7b56..8b33454 100644
--- a/hiera/gadwall.yaml
+++ b/hiera/gadwall.yaml
@@ -79,7 +79,7 @@ mail:
 name: gadwall
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - couchdb
@@ -113,7 +113,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml
index 0a399c3..636c74d 100644
--- a/hiera/gorilla.yaml
+++ b/hiera/gorilla.yaml
@@ -83,7 +83,7 @@ mail:
 name: gorilla
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: internal_service
 services: 
   - couchdb
@@ -109,7 +109,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index cbde76f..961a96c 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -53,7 +53,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
@@ -79,7 +79,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 1f617f9..0f86dbc 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -1,19 +1,18 @@
 --- 
 contacts: 
-  - micah@leap.se
   - sysdev@leap.se
 development: 
   site_config: true
 dns: 
   public: false
 domain: 
-  full: ladybug.dev.bitmask.net
-  full_suffix: dev.bitmask.net
-  internal: ladybug.dev.bitmask.i
-  internal_suffix: dev.bitmask.i
-  name: ladybug.dev.bitmask.i
+  full: ladybug.bitmask.net
+  full_suffix: bitmask.net
+  internal: ladybug.bitmask.i
+  internal_suffix: bitmask.i
+  name: ladybug.bitmask.i
 enabled: true
-environment: development
+environment: disabled
 hosts: {}
 ip_address: "199.119.112.8"
 location: 
@@ -22,8 +21,7 @@ location:
   name: "Washington D.C."
   timezone: "-5"
 mail: 
-  smarthost: 
-    - starfish.dev.bitmask.net
+  smarthost: []
 name: ladybug
 platform: 
   major_version: "0.7"
@@ -100,7 +98,7 @@ stunnel:
   servers: {}
 tags: 
   - dc
-  - development
+  - disabled
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 057293e..d187a77 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -68,28 +68,25 @@ mynetworks:
   - "176.53.69.14"
   - "176.53.69.22"
   - "176.53.69.23"
-  - "192.168.5.10"
   - "192.168.5.12"
-  - "192.168.5.16"
   - "192.168.5.19"
-  - "192.168.5.23"
   - "192.168.5.4"
   - "192.168.5.5"
   - "192.168.5.8"
-  - "192.168.5.9"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.10"
   - "199.119.112.12"
+  - "199.119.112.123"
   - "199.119.112.124"
-  - "199.119.112.16"
+  - "199.119.112.133"
+  - "199.119.112.147"
+  - "199.119.112.149"
+  - "199.119.112.150"
   - "199.119.112.19"
-  - "199.119.112.23"
   - "199.119.112.4"
   - "199.119.112.5"
   - "199.119.112.8"
-  - "199.119.112.9"
   - "202.85.233.34"
   - "204.13.164.162"
   - "204.13.164.171"
@@ -99,7 +96,7 @@ mynetworks:
 name: leech
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - mx
@@ -125,7 +122,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 184d568..2fe9cf2 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -55,7 +55,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
@@ -81,7 +81,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 688f123..9480f0e 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -60,28 +60,25 @@ mynetworks:
   - "176.53.69.14"
   - "176.53.69.22"
   - "176.53.69.23"
-  - "192.168.5.10"
   - "192.168.5.12"
-  - "192.168.5.16"
   - "192.168.5.19"
-  - "192.168.5.23"
   - "192.168.5.4"
   - "192.168.5.5"
   - "192.168.5.8"
-  - "192.168.5.9"
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.10"
   - "199.119.112.12"
+  - "199.119.112.123"
   - "199.119.112.124"
-  - "199.119.112.16"
+  - "199.119.112.133"
+  - "199.119.112.147"
+  - "199.119.112.149"
+  - "199.119.112.150"
   - "199.119.112.19"
-  - "199.119.112.23"
   - "199.119.112.4"
   - "199.119.112.5"
   - "199.119.112.8"
-  - "199.119.112.9"
   - "202.85.233.34"
   - "204.13.164.162"
   - "204.13.164.171"
@@ -91,7 +88,7 @@ mynetworks:
 name: mx1
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - mx
@@ -117,7 +114,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index bbb000a..6e14bc9 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -55,7 +55,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
@@ -82,7 +82,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml
index acb32fe..d19b610 100644
--- a/hiera/plain1.yaml
+++ b/hiera/plain1.yaml
@@ -22,7 +22,7 @@ mail:
 name: plain1
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: internal_service
 services: []
 sources: 
@@ -47,7 +47,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index 7201bb1..1d904c0 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -6,13 +6,13 @@ development:
 dns: 
   public: true
 domain: 
-  full: seahorse.unstable.bitmask.net
-  full_suffix: unstable.bitmask.net
-  internal: seahorse.unstable.bitmask.i
-  internal_suffix: unstable.bitmask.i
-  name: seahorse.unstable.bitmask.net
+  full: seahorse.bitmask.net
+  full_suffix: bitmask.net
+  internal: seahorse.bitmask.i
+  internal_suffix: bitmask.i
+  name: seahorse.bitmask.net
 enabled: true
-environment: unstable
+environment: disabled
 hosts: {}
 ip_address: "199.119.112.12"
 location: 
@@ -21,14 +21,13 @@ location:
   name: "Washington D.C."
   timezone: "-5"
 mail: 
-  smarthost: 
-    - cat.unstable.bitmask.net
+  smarthost: []
 name: seahorse
 obfsproxy: 
   gateway_address: "199.119.112.13"
   scramblesuit: 
-    password: G5AVGZTEL5LTGVLKMV4TS6KVGVSV6X2Q
-    port: 26098
+    password: MI2HSV2TJBHFO4TUKJIUUVCMMNTWOTDV
+    port: 20889
 openvpn: 
   adblock: false
   allow_limited: false
@@ -54,7 +53,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
@@ -80,7 +79,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -127,7 +126,7 @@ stunnel:
   servers: {}
 tags: 
   - dc
-  - unstable
+  - disabled
 tor: 
   bandwidth_rate: 100
 x509: 
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index 0e4dea6..b94b62d 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -87,7 +87,7 @@ mail:
 name: thrips
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - couchdb
@@ -121,7 +121,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml
index 1e2bf28..18c30b0 100644
--- a/hiera/tor1.yaml
+++ b/hiera/tor1.yaml
@@ -22,7 +22,7 @@ mail:
 name: tor1
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: internal_service
 services: 
   - tor
@@ -48,7 +48,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml
index 1bcc103..787afcf 100644
--- a/hiera/vpn1.yaml
+++ b/hiera/vpn1.yaml
@@ -52,7 +52,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
@@ -78,7 +78,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 2625c2b..b55fb9b 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -229,7 +229,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - webapp
@@ -255,7 +255,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/web1.yaml b/hiera/web1.yaml
index 80cc2da..247381a 100644
--- a/hiera/web1.yaml
+++ b/hiera/web1.yaml
@@ -279,7 +279,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - monitor
@@ -306,7 +306,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true