diff options
Diffstat (limited to 'hiera')
-rw-r--r-- | hiera/cat.yaml | 4 | ||||
-rw-r--r-- | hiera/donkey.yaml | 47 |
2 files changed, 9 insertions, 42 deletions
diff --git a/hiera/cat.yaml b/hiera/cat.yaml index 3d3eabd..17ef4d2 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -71,6 +71,7 @@ mx: selector: babcfe98e4 key_lookup_domain: unstable.bitmask.net mynetworks: + - "1.209.122.123" - "176.53.69.13" - "176.53.69.14" - "176.53.69.22" @@ -78,8 +79,6 @@ mynetworks: - "198.252.153.82" - "198.252.153.83" - "198.252.153.85" - - "199.119.112.12" - - "199.119.112.149" - "199.119.112.150" - "199.119.112.151" - "199.119.112.152" @@ -89,7 +88,6 @@ mynetworks: - "199.119.112.206" - "199.119.112.207" - "199.119.112.208" - - "199.119.112.8" - "204.13.164.171" - "204.13.164.57" - "37.218.240.101" diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml index b495f7b..fe19a55 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -249,11 +249,11 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDbVBsw4Hnwoh1h+/J5NP6Uj6s1ViumP6zeeAtrr/ma/NrvR3x1bXmy/O396zbuFER6a8EyhGwY6WI+vKTjKWMGlOaNyNO7s9CB/keFBx4GGTcx55oHFb/WU0BzFUBoLjfEgelx/03+NIrZyW2XaPYDPdmNOfxMtetBziLugTXsXONIZBD4/QCt+LvbYdjWtziCH/EsdFuetDZ+WZrrUjCHyg2Lm8Xd48U/QrfPUb0oP8QZfoToN5l2Mxx7CnxX1s606zc/kkeaiF6+ATUPJ/6CTTdXZUN3Mg9dFMMyyZLB4TpSX7ldnwE2Wkvc/ngQjS/L8YBoMxsywPw7Q2+rFlV" ip_address: "176.53.69.13" port: 4422 - firefly: - domain_full: firefly.dev.bitmask.net - domain_internal: firefly.dev.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" + ferret: + domain_full: ferret.dev.bitmask.net + domain_internal: ferret.dev.bitmask.i + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR/YWDsdYumj5mYunnLgQSuoNMKcItqQT/cmPkFCRp5WERouxdu/GW/0F78K+FyRTp3xwEzJ3BCF/5lbgDH9pRBLiezH+d2Lj2STz82EL0TtOTRtAhF+sK6X2/HFJ6PiIkmAlGGFiw09VR8aGdIhY9FaJATClUWEqjtdFd9BplLWasrmuEVN4kHe2dcO6SxHAfdsmhqd7YdpvfkhenBI1ZPAPYWk72fFFdV35gYBf1H1DewBcobuUCUbd+5EvTJnOfYum9noZBcQScvjuXX/pn4yHefNxh7qBlD92V1hJhK7CHiU4nw2Z4bM2oMLr6Jw81PhQf732DACPrNT+GcEEx" + ip_address: "1.209.122.123" port: 22 goldeneye: domain_full: goldeneye.cdev.bitmask.net @@ -267,12 +267,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 @@ -297,12 +291,6 @@ hosts: 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 @@ -477,12 +465,12 @@ nagios: services: - webapp ssh_port: 4422 - firefly: + ferret: domain_full_suffix: dev.bitmask.net - domain_internal: firefly.dev.bitmask.i + domain_internal: ferret.dev.bitmask.i domain_internal_suffix: dev.bitmask.i environment: development - ip_address: "199.119.112.149" + ip_address: "1.209.122.123" services: - backup ssh_port: 22 @@ -506,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 @@ -554,16 +533,6 @@ nagios: 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 |