firefly got removed from hiera files

3 files changed, 26 insertions, 10 deletions

diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 0fd7821..d8afa40 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -89,6 +89,7 @@ mynetworks:
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.101"
+  - "46.165.242.166"
   - "85.17.92.143"
 name: cat
 platform: 
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 0767898..51e79d3 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -250,11 +250,11 @@ hosts:
     ip_address: "176.53.69.13"
     port: 4422
   firefly: 
-    domain_full: firefly.dev.bitmask.net
-    domain_internal: firefly.dev.bitmask.i
+    domain_full: firefly.bitmask.net
+    domain_internal: firefly.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/jTfvvn8rS730j0VIlgHWUMeUHgtIPFLutHJfwH8HwGl27Osnn2DbK2SWGYkts9XymrLho3InFfF4PotdgecrMFFkRnvnPz/ZbQ1NqYRWcwAYbN7Za8+2zSpxpG9qNEQrcU+nE7OvMgNZZBDz5C3ConxYTUO3nyyEgw/gAS7hz4d2jwN9KoB+w10Si9yd6CAra43/h+371ABAoHkmcUfi1WJKHlxFv29J6ODlwrd4Zr1K5lCl8+m/1QM04RXxInmHGO3foFpH4qY3LaHcYr7xnmmPMRYIbJfZmOXgckgj65Gc+jFUuNj+B+fIzI7Jy4O/hpG+JPT/3XcINjakZFZb"
     ip_address: "199.119.112.149"
-    port: 22
+    port: 4422
   goldeneye: 
     domain_full: goldeneye.cdev.bitmask.net
     domain_internal: goldeneye.cdev.bitmask.i
@@ -285,6 +285,12 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo="
     ip_address: "198.252.153.83"
     port: 4422
+  otter: 
+    domain_full: otter.demo.bitmask.net
+    domain_internal: otter.demo.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp"
+    ip_address: "46.165.242.166"
+    port: 4422
   ovenbird: 
     domain_full: ovenbird.cdev.bitmask.net
     domain_internal: ovenbird.cdev.bitmask.i
@@ -477,14 +483,14 @@ nagios:
         - webapp
       ssh_port: 4422
     firefly: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: firefly.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
+      domain_full_suffix: bitmask.net
+      domain_internal: firefly.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: disabled
       ip_address: "199.119.112.149"
       services: 
         - backup
-      ssh_port: 22
+      ssh_port: 4422
     goldeneye: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: goldeneye.cdev.bitmask.i
@@ -533,6 +539,17 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
+    otter: 
+      domain_full_suffix: demo.bitmask.net
+      domain_internal: otter.demo.bitmask.i
+      domain_internal_suffix: demo.bitmask.i
+      environment: demo
+      ip_address: "46.165.242.166"
+      openvpn_gateway_address: "46.165.242.169"
+      services: 
+        - openvpn
+        - tor
+      ssh_port: 4422
     ovenbird: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: ovenbird.cdev.bitmask.i
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index f0d0230..5ec0a2b 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -144,8 +144,6 @@ stunnel:
 tags: 
   - dc
   - unstable
-tor: 
-  bandwidth_rate: 100
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----