updating DC-situation, adding tuatara, donkey, firefly

1 files changed, 94 insertions, 41 deletions

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 0b8073f..c3ad2d6 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -28,6 +28,27 @@ definition_files:
             "host": "seahorse.unstable.bitmask.net",
             "ip_address": "199.119.112.13",
             "location": "washington_d_c_"
+          },
+          {
+            "capabilities": {
+              "adblock": false,
+              "filter_dns": false,
+              "limited": false,
+              "ports": [
+                "443"
+              ],
+              "protocols": [
+                "tcp",
+                "udp"
+              ],
+              "transport": [
+                "openvpn"
+              ],
+              "user_ips": false
+            },
+            "host": "tuatara.unstable.bitmask.net",
+            "ip_address": "199.119.112.148",
+            "location": "washington_d_c_"
           }
         ],
         "locations": {
@@ -94,9 +115,9 @@ definition_files:
   smtp_service: |
       {
         "hosts": {
-          "octopus": {
-            "hostname": "octopus.unstable.bitmask.net",
-            "ip_address": "199.119.112.16",
+          "cat": {
+            "hostname": "cat.unstable.bitmask.net",
+            "ip_address": "199.119.112.123",
             "location": "washington_d_c_",
             "port": 465
           }
@@ -115,9 +136,9 @@ definition_files:
   soledad_service: |-
       {
         "hosts": {
-          "panda": {
-            "hostname": "panda.unstable.bitmask.net",
-            "ip_address": "199.119.112.9",
+          "aardwolf": {
+            "hostname": "aardwolf.unstable.bitmask.net",
+            "ip_address": "199.119.112.124",
             "location": "washington_d_c_",
             "port": 2323
           }
@@ -154,13 +175,19 @@ haproxy:
   couch: 
     listen_port: 4096
     servers: 
-      panda: 
+      aardwolf: 
         backup: false
         host: localhost
         port: 4000
         weight: 100
         writable: true
 hosts: 
+  aardwolf: 
+    domain_full: aardwolf.unstable.bitmask.net
+    domain_internal: aardwolf.unstable.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq3vwGhiuz1xUG8nL8c1f2+sw8fLcKIpQ0K6W2Bv3dz5/MjdyrsvAz6y/fLfWE2WAGNOaPhYmPFNPbCr6TAWX38NjTRVg2jqwHmdRKTbpGZeRQo3KQ+8UZULQYHVOQAAsdpBhZb5oluBj7et8ZtA/DK52PNXnprbUF0tY6QsXuMA/3XLG1Oc4mb28VbwjdV2ww/SrFqbuAT/hgYHGkC5Ji3wcIdd2gd2Doa2HmAXl8FkLfAyybfXbGVSClSTH+0LH7FqE/octJUyQjVroZzW2LDGbPP+g9ilhuegW6XSTWRUpRtdYsELMUjq3jhasl02dWmWfcbLLlzAi/88SGbkVB"
+    ip_address: "199.119.112.124"
+    port: 22
   ant: 
     domain_full: ant.demo.bitmask.net
     domain_internal: ant.demo.bitmask.i
@@ -179,6 +206,12 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH5g/h43gZ3pQsU8ohme4J2mDeZgxGnd3lfR428GRqxKH4MEDGGrimpK1oPf6scey+oD8WYvSYP3ZjPFZHxyq4A="
     ip_address: "192.168.5.4"
     port: 22
+  cat: 
+    domain_full: cat.unstable.bitmask.net
+    domain_internal: cat.unstable.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiGuqt+UfwqRvJdL6vioX8+oyRnZZKZ8uPKbMRmT7uR7z15Ox4QpNpW2aOTJ8Dwy4jPo5icEkYeGxXNdJMuooIxc1SgcaTpyh/epVGNV/K409t9KAi057eEMgp75dKi7f8kq+jvXeK1+ZdT6DvxvHQVMkKi0KeT8rw2F2Vdqh2upGiHtjLDXtF2ySLjwJ3gxqVjvsfDUxIYdBabK3eLuRINXwGKnJHmKO6MqQR4dOlOPG+3EdgVunWmVSA+1Uo8EZU6kbJ9T5MbpEDAV9K0R1HgdB2UTu/agFOVOYKylROcNzu2nES9qCat6/THK8lCVKBDywjpoQZ9vqSH9oFwond"
+    ip_address: "199.119.112.123"
+    port: 22
   chameleon: 
     domain_full: chameleon.unstable.bitmask.net
     domain_internal: chameleon.unstable.bitmask.i
@@ -209,6 +242,12 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2iNuS97BTd7flA/8nho/w3+THNriQPf1IpgcI/TCaTxIG5T85FRIApNAIxayJjBAt9C/MM8LMUlpRTq1Y8vlpYmfcWAJj5V8bbP03TXNIkgK8rtStjN061bhWXo4AVfD1hFyL+wUrdGRX2laaJvOgMO+UCkYb9PPqEfyKCMhcu3Da7auznYucrNxcJwCU4TpVgmQDYE0DWpYkssTbGJ7YJOZAtwNWtOrZFVRzOvMy3WvAM/s0x/ME6CQi6k6dDHlSpafhPAl/B4koTtnPksmXc7xCpmaun1j68C0yvD1l9QBPKyFwJ1KCJgx+9++CqnSFbIbX3ebb0FGtMHrak2xL"
     ip_address: "204.13.164.171"
     port: 22
+  donkey: 
+    domain_full: donkey.unstable.bitmask.net
+    domain_internal: donkey.unstable.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Ev3JGSbAtaW0QED84WQ3k6Jkaxigy5XzkV4INQaQfxw3wkJZJtJZpWmj/baeAWioZrQPKRIQqujOWpxJAmArp7KSDyr51L7U9ysZ1velbl6NN+uu0EZCz/jjQei+3i0jy8FJu/ANwCJbGsvtvyL+tbcVHWS3BMsKMQKiLCuCHx/BxlkmGbTJRzLVXlk4ibeHMn667AUBxMPmrBpZXshytcrz0Z9zR/EyXHuuqoLjjX6hsWU2ppQti/1OJ8TUb2xYhU4cXCr4+c/1ywysLgNnpLxF6dBITDtnNhPjKLdmj6B+NkOqjgUNEU7p7h9dbpUmdDdkHlmz47EUJqng4sMp"
+    ip_address: "199.119.112.133"
+    port: 22
   elephant: 
     domain_full: elephant.dev.bitmask.net
     domain_internal: elephant.dev.bitmask.i
@@ -257,24 +296,12 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo="
     ip_address: "198.252.153.83"
     port: 4422
-  octopus: 
-    domain_full: octopus.unstable.bitmask.net
-    domain_internal: octopus.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLbvsEZGXVaC74PcXd/M4wwv7nnAhg3318EqcGbo2aX5Tt+mAYbxjLj+HAiJgG63Mp6+GEuH5KNwgrRNwaOqh84tOMOYOKFAdgha4z6WC9q9sFIkqwaE2KDfoENKyUo0ywb0aBAW0EvYMt92BL7p5T8oQr/SbFw/GW1iyEqCPFK4VcupdnjDd8wyolgLawg0Okah5IHVosuJQEZXii7I0nhAl5OUkn5DIr6NklW6gTht+m6yRl7KNS+SGfyZs5U/1NywtwqPIH5Zgwt3Cphzga+d++6HbpO3PXA1PmN/bYJGDC0zG9gDSae1mvc+pDWWELgHEfpjzigrqqeNJtO2UD"
-    ip_address: "192.168.5.16"
-    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
-  panda: 
-    domain_full: panda.unstable.bitmask.net
-    domain_internal: panda.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2cA8eQ4VD3tW7p+Fy0ZLXBzFbgwFOXjdau8zQd0WzJd2sifsLMHv/iGcfELsK+O7Jh7KsezwhT+seZQR6QmdX4qgFvtKB86DgUmMVc5k1Zja1+vXjhsMVB0/EY7k7CM3Clm8NRJzjiA407TFYsCMLuVRaW5hvgFiH9+4aszbmtbfWoFVT97y3o2bkP0exz5jxgKsnlJDF9HJBsVEHXnozvopZeoprrDbtJZQGQA+HcllJm678sIzwEwWn/6JtH6LmcvhnRL5ohd0Tlhf/lqFS9if+EzEt278crUMWcePSxb7a4lV6cJrxE3VaiZ+ldsvJebcYDvtJCK1T8ea4OarB"
-    ip_address: "192.168.5.9"
-    port: 4422
   seahorse: 
     domain_full: seahorse.unstable.bitmask.net
     domain_internal: seahorse.unstable.bitmask.i
@@ -299,6 +326,12 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0="
     ip_address: "204.13.164.162"
     port: 4422
+  tuatara: 
+    domain_full: tuatara.unstable.bitmask.net
+    domain_internal: tuatara.unstable.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDV21ji3dj1+hbQ4hyY3qRpU3VS8WVIpGTXT+03mrYT+Kq3Ma3ECd32vuf6dbPbKKCbzMlxzXJHj94Hj8KaIwtEO/oqckFRZrxXD1DVAXomXS5TGzzo3mkWYXjeBiiITEJxc60CfYG7fbZ+mmmzj9x/0HTcO0O686vXZQQN/7Bc16Z5uV91ZPRiB1UxPi2ngnxMS4YAZaFktqd8tmiK9uzGIbFzDCWKToi0GJnV/cBLcGxz3hyUMeGLXoRHETzn/x4f+tYlblA2cTz1rLLmGZu7sqAfEHuquinbRlxbsfpPGXQ2RDewa7nHTiRfdspxt0Lo41A0o04tyH/CaTnAc4BL"
+    ip_address: "199.119.112.147"
+    port: 22
   wallaby: 
     domain_full: wallaby.demo.bitmask.net
     domain_internal: wallaby.demo.bitmask.i
@@ -313,7 +346,7 @@ location:
   timezone: "-5"
 mail: 
   smarthost: 
-    - octopus.unstable.bitmask.net
+    - cat.unstable.bitmask.net
 nagios: 
   domains_internal: 
     - bitmask.i
@@ -348,6 +381,16 @@ nagios:
       contact_emails: 
         - sysdev@leap.se
   hosts: 
+    aardwolf: 
+      domain_full_suffix: unstable.bitmask.net
+      domain_internal: aardwolf.unstable.bitmask.i
+      domain_internal_suffix: unstable.bitmask.i
+      environment: unstable
+      ip_address: "199.119.112.124"
+      services: 
+        - couchdb
+        - soledad
+      ssh_port: 22
     ant: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: ant.demo.bitmask.i
@@ -375,6 +418,15 @@ nagios:
       services: 
         - webapp
       ssh_port: 22
+    cat: 
+      domain_full_suffix: unstable.bitmask.net
+      domain_internal: cat.unstable.bitmask.i
+      domain_internal_suffix: unstable.bitmask.i
+      environment: unstable
+      ip_address: "199.119.112.123"
+      services: 
+        - mx
+      ssh_port: 22
     chameleon: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: chameleon.unstable.bitmask.i
@@ -422,6 +474,16 @@ nagios:
       services: 
         - backup
       ssh_port: 22
+    donkey: 
+      domain_full_suffix: unstable.bitmask.net
+      domain_internal: donkey.unstable.bitmask.i
+      domain_internal_suffix: unstable.bitmask.i
+      environment: unstable
+      ip_address: "199.119.112.133"
+      services: 
+        - monitor
+        - webapp
+      ssh_port: 22
     elephant: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: elephant.dev.bitmask.i
@@ -497,15 +559,6 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
-    octopus: 
-      domain_full_suffix: unstable.bitmask.net
-      domain_internal: octopus.unstable.bitmask.i
-      domain_internal_suffix: unstable.bitmask.i
-      environment: unstable
-      ip_address: "199.119.112.16"
-      services: 
-        - mx
-      ssh_port: 4422
     otter: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: otter.demo.bitmask.i
@@ -517,16 +570,6 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
-    panda: 
-      domain_full_suffix: unstable.bitmask.net
-      domain_internal: panda.unstable.bitmask.i
-      domain_internal_suffix: unstable.bitmask.i
-      environment: unstable
-      ip_address: "199.119.112.9"
-      services: 
-        - couchdb
-        - soledad
-      ssh_port: 4422
     seahorse: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: seahorse.unstable.bitmask.i
@@ -566,6 +609,16 @@ nagios:
         - couchdb
         - soledad
       ssh_port: 4422
+    tuatara: 
+      domain_full_suffix: unstable.bitmask.net
+      domain_internal: tuatara.unstable.bitmask.i
+      domain_internal_suffix: unstable.bitmask.i
+      environment: unstable
+      ip_address: "199.119.112.147"
+      openvpn_gateway_address: "199.119.112.148"
+      services: 
+        - openvpn
+      ssh_port: 22
     wallaby: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: wallaby.demo.bitmask.i
@@ -668,9 +721,9 @@ ssh:
 stunnel: 
   clients: 
     couch_client: 
-      panda_5984: 
+      aardwolf_5984: 
         accept_port: 4000
-        connect: panda.unstable.bitmask.i
+        connect: aardwolf.unstable.bitmask.i
         connect_port: 15984
         original_port: 5984
   servers: {}