recompile

10 files changed, 161 insertions, 184 deletions

diff --git a/files/nodes/hippo/hippo.crt b/files/nodes/hippo/hippo.crt
index 3fba794..482ac62 100644
--- a/files/nodes/hippo/hippo.crt
+++ b/files/nodes/hippo/hippo.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-Ph1Kuw==
+MA0GCSqGSIb3DQEBCwUAA4ICAQBqmP9n6KoEg5is1maivfensCmz0gtTZi9RSAD9
+cSo7cnmmoUyCaIrWHw0fxUuyTedI6F7epu2IcoFYmLgVCY2lhm/qT1BB2Unx27xe
+gVyKlIY9MzGqBBp+TgpYec56G+JMlO4ZEWxzhemec4/Tg+kooJ0MBMq9p///Ao0J
+xVyOuJE9O4/rBYvNY6y2XEIhWORuweCqakW3LLdgW0l6ZiETth139NyB8Z3vyYtz
+0taJo72NxBRsmT2hp89Faa46XxQ8Wj32GFd1tHWxavIqE0KRXl9rdraRgCEwZg9U
+rf+8azJsw8yMEA+66rqc7BXaz8maW94aradk28vqCh9/SGXldcWu4PPwzHZ+ZVsC
+RnaIF0THdUhBKnVnfFko2ImL+HFJR9k2rkSRiiD7LjEvPY3/+YUtj0J0y9I9NP3R
+EIIbu+MvMsI7+2/ZFo0HKNNMcU/dXSF4/gv5WGtygLLD1cwxKXZqay25rP0hCoQM
+Ri0y+0iwVRCD+4+XmZlXqy0nL4NLV8t2gBcjlhtctR62qV2y7mDwyU9TwDHEBHVA
+z0JSIop73x57dJQCD78MDBaXZqAyrgBYdJXqC+5fN1diLokNF+PCY+voLqcsYtA0
+2nMiuT1XPtpymnnXK9ArxWEVK1ABOUTRvJcUHJK+0hPtMZAh894cUlu9fJL+AfYq
+4PEGFw==
 -----END CERTIFICATE-----
diff --git a/files/nodes/hippo/hippo.key b/files/nodes/hippo/hippo.key
index 307dd77..97171f9 100644
--- a/files/nodes/hippo/hippo.key
+++ b/files/nodes/hippo/hippo.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 604d041..9b7e95e 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -229,7 +229,6 @@ mynetworks:
   - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "204.13.164.57"
   - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index c244127..853c3b8 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -97,7 +97,6 @@ mynetworks:
   - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "204.13.164.57"
   - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 46128c8..25c4399 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -20,8 +20,7 @@ definition_files:
                 "443"
               ],
               "protocols": [
-                "tcp",
-                "udp"
+                "tcp"
               ],
               "transport": [
                 "openvpn"
@@ -276,6 +275,10 @@ hosts:
     ip_address: "85.17.92.143"
     port: 4422
   leech: 
+    aliases: 
+      - api.demo.bitmask.net
+      - demo.bitmask.net
+      - nicknym.demo.bitmask.net
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
@@ -315,16 +318,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n"
     ip_address: "199.119.112.208"
     port: 22
-  wallaby: 
-    aliases: 
-      - api.demo.bitmask.net
-      - demo.bitmask.net
-      - nicknym.demo.bitmask.net
-    domain_full: wallaby.demo.bitmask.net
-    domain_internal: wallaby.demo.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ="
-    ip_address: "204.13.164.57"
-    port: 4422
 ip_address: "199.119.112.207"
 location: 
   country_code: US
@@ -503,6 +496,7 @@ nagios:
       ip_address: "198.252.153.85"
       services: 
         - mx
+        - webapp
       ssh_port: 4422
     millipede: 
       domain_full_suffix: demo.bitmask.net
@@ -556,15 +550,6 @@ nagios:
       services: 
         - openvpn
       ssh_port: 22
-    wallaby: 
-      domain_full_suffix: demo.bitmask.net
-      domain_internal: wallaby.demo.bitmask.i
-      domain_internal_suffix: demo.bitmask.i
-      environment: demo
-      ip_address: "204.13.164.57"
-      services: 
-        - webapp
-      ssh_port: 4422
   nagiosadmin_pw: r35FbwIuktJZXFfbnrVxCh8StDnIzhXj
 name: donkey
 nickserver: 
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index d47d8a7..14d966b 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -21,8 +21,7 @@ definition_files:
                 "443"
               ],
               "protocols": [
-                "tcp",
-                "udp"
+                "tcp"
               ],
               "transport": [
                 "openvpn"
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index bcdb3cd..7116219 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -58,7 +58,6 @@ openvpn:
     - "443"
   protocols: 
     - tcp
-    - udp
   rate_limit: ~
   second_gateway_address: ~
   unlimited_prefix: UNLIMITED
@@ -182,37 +181,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      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
+      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
-      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
-      Ph1Kuw==
+      MA0GCSqGSIb3DQEBCwUAA4ICAQBqmP9n6KoEg5is1maivfensCmz0gtTZi9RSAD9
+      cSo7cnmmoUyCaIrWHw0fxUuyTedI6F7epu2IcoFYmLgVCY2lhm/qT1BB2Unx27xe
+      gVyKlIY9MzGqBBp+TgpYec56G+JMlO4ZEWxzhemec4/Tg+kooJ0MBMq9p///Ao0J
+      xVyOuJE9O4/rBYvNY6y2XEIhWORuweCqakW3LLdgW0l6ZiETth139NyB8Z3vyYtz
+      0taJo72NxBRsmT2hp89Faa46XxQ8Wj32GFd1tHWxavIqE0KRXl9rdraRgCEwZg9U
+      rf+8azJsw8yMEA+66rqc7BXaz8maW94aradk28vqCh9/SGXldcWu4PPwzHZ+ZVsC
+      RnaIF0THdUhBKnVnfFko2ImL+HFJR9k2rkSRiiD7LjEvPY3/+YUtj0J0y9I9NP3R
+      EIIbu+MvMsI7+2/ZFo0HKNNMcU/dXSF4/gv5WGtygLLD1cwxKXZqay25rP0hCoQM
+      Ri0y+0iwVRCD+4+XmZlXqy0nL4NLV8t2gBcjlhtctR62qV2y7mDwyU9TwDHEBHVA
+      z0JSIop73x57dJQCD78MDBaXZqAyrgBYdJXqC+5fN1diLokNF+PCY+voLqcsYtA0
+      2nMiuT1XPtpymnnXK9ArxWEVK1ABOUTRvJcUHJK+0hPtMZAh894cUlu9fJL+AfYq
+      4PEGFw==
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -265,55 +264,55 @@ x509:
       -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml
index d0905c7..de14e19 100644
--- a/hiera/mudskipper.yaml
+++ b/hiera/mudskipper.yaml
@@ -206,7 +206,6 @@ mynetworks:
   - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "204.13.164.57"
   - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 5229c13..ffa18b5 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -104,7 +104,6 @@ mynetworks:
   - "199.119.112.208"
   - "199.119.112.223"
   - "204.13.164.171"
-  - "204.13.164.57"
   - "37.218.240.50"
   - "46.165.242.166"
   - "85.17.92.143"
@@ -133,7 +132,6 @@ openvpn:
     - "443"
   protocols: 
     - tcp
-    - udp
   rate_limit: ~
   second_gateway_address: ~
   unlimited_prefix: UNLIMITED
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index b8fc47f..b07430b 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -59,7 +59,6 @@ openvpn:
     - "443"
   protocols: 
     - tcp
-    - udp
   rate_limit: ~
   second_gateway_address: ~
   unlimited_prefix: UNLIMITED