diff options
| author | kwadronaut <kwadronaut@leap.se> | 2014-06-23 13:41:04 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2014-06-23 13:41:04 +0200 |
| commit | c550c16d8690d65d3ef8a5d8da59cb7426aaabfd (patch) | |
| tree | c9a3395b4c40886f5a57c32edab6301f7688badf /hiera/chameleon.yaml | |
| parent | ed266f2448eecdd211b3911c08877f51ecf49ef7 (diff) | |
add deer tor exit in hongkong on dev.bitmask
Diffstat (limited to 'hiera/chameleon.yaml')
| -rw-r--r-- | hiera/chameleon.yaml | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml index 0fdb410..e41f788 100644 --- a/hiera/chameleon.yaml +++ b/hiera/chameleon.yaml @@ -183,6 +183,11 @@ hosts: domain_internal: clam.dev.bitmask.i host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGhp+VPPTcONp7C4skQ4CGQzxBIrDlwO9ZJT1jwelANycjrcfgnpqQMdA3G6bwuscaaWgiYXt1BU8VZoRJ+xrOs=" ip_address: "176.53.69.22" + deer: + domain_full: deer.dev.bitmask.net + domain_internal: deer.dev.bitmask.i + host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPpU2C8h4d3IKFYWptTHW8Td3r17cCdkfUFhsS0hLVwyIncuaQG1QJFAWsZnfcpTHMDWcXd58syVp+hVIiJLRtQ=" + ip_address: "202.85.227.195" demodex: domain_full: demodex.dev.bitmask.net domain_internal: demodex.dev.bitmask.i @@ -238,11 +243,6 @@ hosts: domain_internal: panda.unstable.bitmask.i host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMXoqGZhCbBt3P9H2LbE9gYlQZ2S/P/w7d8AGKdXGrbiPUJ8xLl8lNOy1Tia02NYuNYe8ehX5GjswLOwu59IkRY=" ip_address: "192.168.5.9" - rhino: - domain_full: rhino.dev.bitmask.net - domain_internal: rhino.dev.bitmask.i - host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBWT/rRebh7gx4TOWgDoL2zK1r0BlxUDpYDOMCMFThELFZ1rASp+Yj8CipL3AztNRuK+VepXHmMmwSQftgYDiy0=" - ip_address: "202.85.227.204" seahorse: domain_full: seahorse.unstable.bitmask.net domain_internal: seahorse.unstable.bitmask.i @@ -321,6 +321,13 @@ nagios: - couchdb - soledad ssh_port: 4422 + deer: + domain_full_suffix: dev.bitmask.net + domain_internal: deer.dev.bitmask.i + ip_address: "202.85.227.195" + services: + - tor + ssh_port: 22 demodex: domain_full_suffix: dev.bitmask.net domain_internal: demodex.dev.bitmask.i @@ -403,13 +410,6 @@ nagios: - couchdb - soledad ssh_port: 4422 - rhino: - domain_full_suffix: dev.bitmask.net - domain_internal: rhino.dev.bitmask.i - ip_address: "202.85.227.204" - services: - - tor - ssh_port: 22 seahorse: domain_full_suffix: unstable.bitmask.net domain_internal: seahorse.unstable.bitmask.i @@ -560,6 +560,8 @@ webapp: customization_dir: /etc/leap/files/webapp/ default_service_level: 1 domain: unstable.bitmask.net + engines: + - support git: revision: origin/master source: "https://leap.se/git/leap_web" |