From 9cceb29cc48ecde92802bd54a414ab52b1bda2c2 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 17 Dec 2014 14:03:46 -0800
Subject: full recompile

---
 hiera/chameleon.yaml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'hiera/chameleon.yaml')

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index b5e369b..b20dc32 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -229,8 +229,8 @@ hosts:
     ip_address: "192.168.5.5"
     port: 22
   hippo: 
-    domain_full: hippo.demo.bitmask.net
-    domain_internal: hippo.demo.bitmask.i
+    domain_full: hippo.bitmask.net
+    domain_internal: hippo.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc="
     ip_address: "85.17.92.143"
     port: 4422
@@ -335,6 +335,9 @@ nagios:
       contact_emails: 
         - micah@leap.se
         - sysdev@leap.se
+    disabled: 
+      contact_emails: 
+        - sysdev@leap.se
     production: 
       contact_emails: 
         - sysdev@leap.se
@@ -446,15 +449,14 @@ nagios:
         - soledad
       ssh_port: 22
     hippo: 
-      domain_full_suffix: demo.bitmask.net
-      domain_internal: hippo.demo.bitmask.i
-      domain_internal_suffix: demo.bitmask.i
-      environment: demo
+      domain_full_suffix: bitmask.net
+      domain_internal: hippo.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: disabled
       ip_address: "85.17.92.143"
       openvpn_gateway_address: "85.17.92.167"
       services: 
         - openvpn
-        - tor
       ssh_port: 4422
     ladybug: 
       domain_full_suffix: dev.bitmask.net
-- 
cgit v1.2.3