diff options
| -rw-r--r-- | hiera/chameleon.yaml | 16 | ||||
| -rw-r--r-- | hiera/monitor1.yaml | 13 | ||||
| -rw-r--r-- | hiera/seahorse.yaml | 2 | ||||
| -rw-r--r-- | hiera/tor1.yaml | 2 | ||||
| -rw-r--r-- | hiera/vpn1.yaml | 2 |
5 files changed, 23 insertions, 12 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml index b5e369b..b20dc32 100644 --- a/hiera/chameleon.yaml +++ b/hiera/chameleon.yaml @@ -229,8 +229,8 @@ hosts: ip_address: "192.168.5.5" port: 22 hippo: - domain_full: hippo.demo.bitmask.net - domain_internal: hippo.demo.bitmask.i + domain_full: hippo.bitmask.net + domain_internal: hippo.bitmask.i host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=" ip_address: "85.17.92.143" port: 4422 @@ -335,6 +335,9 @@ nagios: contact_emails: - micah@leap.se - sysdev@leap.se + disabled: + contact_emails: + - sysdev@leap.se production: contact_emails: - sysdev@leap.se @@ -446,15 +449,14 @@ nagios: - soledad ssh_port: 22 hippo: - domain_full_suffix: demo.bitmask.net - domain_internal: hippo.demo.bitmask.i - domain_internal_suffix: demo.bitmask.i - environment: demo + domain_full_suffix: bitmask.net + domain_internal: hippo.bitmask.i + domain_internal_suffix: bitmask.i + environment: disabled ip_address: "85.17.92.143" openvpn_gateway_address: "85.17.92.167" services: - openvpn - - tor ssh_port: 4422 ladybug: domain_full_suffix: dev.bitmask.net diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml index 1d624af..a551d15 100644 --- a/hiera/monitor1.yaml +++ b/hiera/monitor1.yaml @@ -61,10 +61,7 @@ mail: - mx1.bitmask.net nagios: domains_internal: - - cdev.bitmask.i - - demo.bitmask.i - - dev.bitmask.i - - unstable.bitmask.i + - bitmask.i environments: local: contact_emails: @@ -73,6 +70,7 @@ nagios: couch1: domain_full_suffix: bitmask.net domain_internal: couch1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.44" services: @@ -82,6 +80,7 @@ nagios: couch2: domain_full_suffix: bitmask.net domain_internal: couch2.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.52" services: @@ -91,6 +90,7 @@ nagios: monitor1: domain_full_suffix: bitmask.net domain_internal: monitor1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.49" services: @@ -99,6 +99,7 @@ nagios: mx1: domain_full_suffix: bitmask.net domain_internal: mx1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.51" services: @@ -107,6 +108,7 @@ nagios: plain1: domain_full_suffix: bitmask.net domain_internal: plain1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.53" services: [] @@ -114,6 +116,7 @@ nagios: tor1: domain_full_suffix: bitmask.net domain_internal: tor1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.50" services: @@ -122,6 +125,7 @@ nagios: vpn1: domain_full_suffix: bitmask.net domain_internal: vpn1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.45" openvpn_gateway_address: "10.5.5.46" @@ -131,6 +135,7 @@ nagios: web1: domain_full_suffix: bitmask.net domain_internal: web1.bitmask.i + domain_internal_suffix: bitmask.i environment: local ip_address: "10.5.5.47" services: diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml index 28dd326..775d7d7 100644 --- a/hiera/seahorse.yaml +++ b/hiera/seahorse.yaml @@ -101,6 +101,8 @@ stunnel: tags: - dc - unstable +tor: + bandwidth_rate: 100 x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml index abb8e63..1e0ef4a 100644 --- a/hiera/tor1.yaml +++ b/hiera/tor1.yaml @@ -72,7 +72,7 @@ tor: bandwidth_rate: 6550 contacts: - sysdev@leap.se - family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT,otterbagtc8Z3KPmfnT" + family: "deeruSaR9IekHdQGUGI,otterbagtc8Z3KPmfnT" hidden_service: active: ~ address: ~ diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml index 5d24276..07664ec 100644 --- a/hiera/vpn1.yaml +++ b/hiera/vpn1.yaml @@ -98,6 +98,8 @@ stunnel: servers: {} tags: - local +tor: + bandwidth_rate: 100 x509: ca_cert: | -----BEGIN CERTIFICATE----- |