summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-12-04 10:19:49 +0100
committervarac <varacanero@zeromail.org>2014-12-04 10:19:49 +0100
commitba655df0f396a4dae3d06509088125bc0360a622 (patch)
treeb5ff25842e565cc684375d5109371429a54b862c /hiera
parent20a11ea21b746dd6e53f3bd8eea7313b7143ee75 (diff)
leap compile for unstable, pinned to unstable env
Diffstat (limited to 'hiera')
-rw-r--r--hiera/chameleon.yaml16
-rw-r--r--hiera/octopus.yaml1
2 files changed, 17 insertions, 0 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 22ec485..f828da9 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -258,6 +258,12 @@ hosts:
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
@@ -472,6 +478,16 @@ nagios:
services:
- mx
ssh_port: 4422
+ otter:
+ domain_full_suffix: demo.bitmask.net
+ domain_internal: otter.demo.bitmask.i
+ environment: demo
+ ip_address: "46.165.242.166"
+ openvpn_gateway_address: "46.165.242.169"
+ services:
+ - openvpn
+ - tor
+ ssh_port: 4422
panda:
domain_full_suffix: unstable.bitmask.net
domain_internal: panda.unstable.bitmask.i
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index c25a673..3bf4cb6 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -81,6 +81,7 @@ mynetworks:
- "204.13.164.162"
- "204.13.164.171"
- "204.13.164.57"
+ - "46.165.242.166"
- "85.17.92.143"
name: octopus
platform: