leap compile

1 files changed, 0 insertions, 54 deletions

diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 3929442..0c10e82 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -275,12 +275,6 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc="
     ip_address: "85.17.92.143"
     port: 4422
-  ladybug: 
-    domain_full: ladybug.bitmask.net
-    domain_internal: ladybug.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN"
-    ip_address: "199.119.112.8"
-    port: 22
   leech: 
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
@@ -309,22 +303,6 @@ hosts:
     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: 
-    aliases: 
-      - api.cdev.bitmask.net
-      - cdev.bitmask.net
-      - nicknym.cdev.bitmask.net
-    domain_full: ovenbird.cdev.bitmask.net
-    domain_internal: ovenbird.cdev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
-    ip_address: "199.119.112.151"
-    port: 22
-  seahorse: 
-    domain_full: seahorse.bitmask.net
-    domain_internal: seahorse.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1"
-    ip_address: "199.119.112.12"
-    port: 4422
   snail: 
     domain_full: snail.dev.bitmask.net
     domain_internal: snail.dev.bitmask.i
@@ -516,15 +494,6 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
-    ladybug: 
-      domain_full_suffix: bitmask.net
-      domain_internal: ladybug.bitmask.i
-      domain_internal_suffix: bitmask.i
-      environment: disabled
-      ip_address: "199.119.112.8"
-      services: 
-        - backup
-      ssh_port: 22
     leech: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: leech.demo.bitmask.i
@@ -565,25 +534,6 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
-    ovenbird: 
-      domain_full_suffix: cdev.bitmask.net
-      domain_internal: ovenbird.cdev.bitmask.i
-      domain_internal_suffix: cdev.bitmask.i
-      environment: clientdev
-      ip_address: "199.119.112.151"
-      services: 
-        - webapp
-      ssh_port: 22
-    seahorse: 
-      domain_full_suffix: bitmask.net
-      domain_internal: seahorse.bitmask.i
-      domain_internal_suffix: bitmask.i
-      environment: disabled
-      ip_address: "199.119.112.12"
-      openvpn_gateway_address: "199.119.112.13"
-      services: 
-        - openvpn
-      ssh_port: 4422
     snail: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: snail.dev.bitmask.i
@@ -743,11 +693,7 @@ webapp:
       - "199.119.112.206"
       - "199.119.112.207"
       - "199.119.112.208"
-<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
-    monitor: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
-=======
     monitor: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
->>>>>>> new unstable environment
   api_version: 1
   billing: 
     braintree: