diff options
| author | elijah <elijah@riseup.net> | 2016-02-18 09:45:41 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-02-18 09:45:41 -0800 |
| commit | 9a8f814976f642da5dac05367249c8ad0173b930 (patch) | |
| tree | e4c18625f7f3c51c0d0774035b01739798d92985 | |
| parent | 9241ab108dd6059fc48c87201a11555e85bfcce6 (diff) | |
| parent | 1f43a442a5c7eb336a8913208f0f435ae26228de (diff) | |
Merge branch 'master' of ssh://leap.se/bitmask
| -rw-r--r-- | hiera/aardwolf.yaml | 1 | ||||
| -rw-r--r-- | hiera/cat.yaml | 1 | ||||
| -rw-r--r-- | hiera/clam.yaml | 1 | ||||
| -rw-r--r-- | hiera/donkey.yaml | 17 | ||||
| -rw-r--r-- | hiera/starfish.yaml | 1 |
5 files changed, 1 insertions, 20 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml index a52efdc..7aab05d 100644 --- a/hiera/aardwolf.yaml +++ b/hiera/aardwolf.yaml @@ -81,7 +81,6 @@ soledad: salt: 7f725f3cc60c388e9af8140555e09dfa username: soledad port: 2323 - require_couchdb: true sources: apt: backports: "http://httpredir.debian.org/debian/" diff --git a/hiera/cat.yaml b/hiera/cat.yaml index c9b150a..4b4daf5 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -85,7 +85,6 @@ mynetworks: - "199.119.112.207" - "199.119.112.208" - "199.119.112.8" - - "204.13.164.162" - "204.13.164.171" - "204.13.164.57" - "37.218.240.101" diff --git a/hiera/clam.yaml b/hiera/clam.yaml index 8d7d2f7..e34a577 100644 --- a/hiera/clam.yaml +++ b/hiera/clam.yaml @@ -82,7 +82,6 @@ soledad: salt: e3bec4f7126db333ce796beabd322244 username: soledad port: 2323 - require_couchdb: true sources: apt: backports: "http://httpredir.debian.org/debian/" diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml index 344691c..e236fa2 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -315,12 +315,6 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh" ip_address: "176.53.69.23" port: 4422 - thrips: - domain_full: thrips.demo.bitmask.net - domain_internal: thrips.demo.bitmask.i - host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0=" - ip_address: "204.13.164.162" - port: 4422 tuatara: domain_full: tuatara.unstable.bitmask.net domain_internal: tuatara.unstable.bitmask.i @@ -394,6 +388,7 @@ nagios: ip_address: "198.252.153.82" services: - couchdb + - soledad ssh_port: 4422 antelope: domain_full_suffix: mail.bitmask.net @@ -588,16 +583,6 @@ nagios: services: - mx ssh_port: 4422 - thrips: - domain_full_suffix: demo.bitmask.net - domain_internal: thrips.demo.bitmask.i - domain_internal_suffix: demo.bitmask.i - environment: demo - ip_address: "204.13.164.162" - services: - - couchdb - - soledad - ssh_port: 4422 tuatara: domain_full_suffix: unstable.bitmask.net domain_internal: tuatara.unstable.bitmask.i diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml index d064f57..596bcdb 100644 --- a/hiera/starfish.yaml +++ b/hiera/starfish.yaml @@ -86,7 +86,6 @@ mynetworks: - "199.119.112.207" - "199.119.112.208" - "199.119.112.8" - - "204.13.164.162" - "204.13.164.171" - "204.13.164.57" - "37.218.240.101" |