diff options
author | varac <varacanero@zeromail.org> | 2013-01-28 16:54:22 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-01-28 16:54:22 +0100 |
commit | b9dc3194a6023c65cc78988dfc4cf546ba658eac (patch) | |
tree | a4675bfdc96dc48caf86b8bae80c3d8c7b4eb630 /provider_base | |
parent | 00252d3e425bb385135faf6bda4c462bcce75e59 (diff) | |
parent | f34cecba90941f3e4acbe88cab6ce0b5a76b8ce2 (diff) |
Merge branch 'feature/monitoring' into develop
Diffstat (limited to 'provider_base')
-rw-r--r-- | provider_base/common.json | 6 | ||||
-rw-r--r-- | provider_base/services/monitor.json | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index b5d37f8e..8ffe8cd4 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -24,5 +24,9 @@ "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil", "ca_cert": "= try_file :ca_cert" }, - "local": false + "local": false, + "service_type": "internal_service", + "development": { + "site_config": true + } } diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json new file mode 100644 index 00000000..0a44ded1 --- /dev/null +++ b/provider_base/services/monitor.json @@ -0,0 +1,6 @@ +{ + "nagios": { + "nagiosadmin_pw": "= secret :nagios_admin_password", + "hosts": "= nodes['production' => true].fields('domain.full', 'ip_address', 'services')" + } +}
\ No newline at end of file |