diff options
author | elijah <elijah@riseup.net> | 2014-11-24 14:26:56 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-11-24 14:26:56 -0800 |
commit | f2b9da8ea0f8a138af63f05fe1e43c90b237ebd7 (patch) | |
tree | b3bf400f8c2a725027555de0fbe6beab14251664 /hiera/monitor1.yaml | |
parent | 374a68a2d63b66d23a69b7922dea27b4d2a008c3 (diff) | |
parent | 364a43d1ac65abd030baeddfc3eff763486cfe16 (diff) |
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'hiera/monitor1.yaml')
-rw-r--r-- | hiera/monitor1.yaml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml index 9071644..3893d12 100644 --- a/hiera/monitor1.yaml +++ b/hiera/monitor1.yaml @@ -52,11 +52,6 @@ mail: smarthost: - mx1.bitmask.net nagios: - domains_internal: - - cdev.bitmask.i - - demo.bitmask.i - - dev.bitmask.i - - unstable.bitmask.i hosts: couch1: domain_full_suffix: bitmask.net @@ -118,9 +113,6 @@ nagios: ssh_port: 22 nagiosadmin_pw: Y_uRtQby7LtwXxFRhIv_qVVrwWHzYrQq name: monitor1 -platform: - major_version: "0.6" - version: "0.6" service_type: internal_service services: - monitor @@ -171,9 +163,6 @@ ssh: enabled: true ports: "60000:61000" port: 22 -stunnel: - clients: {} - servers: {} tags: - local x509: @@ -598,4 +587,3 @@ x509: exVX87n7WqrJ9tG9aM0KVRNONhucBKICpzmPCCeFWsehWImIlsfn4nda -----END RSA PRIVATE KEY----- use: true - use_commercial: true |