summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-02-08 19:40:56 -0800
committerelijah <elijah@riseup.net>2013-02-08 19:40:56 -0800
commit49fc7e085f635c906b32adfc41a207939be2cf39 (patch)
tree50cf140bf27245a2cde585a5ad676a617dd38006
parentc43bb848ab337ba59b34cdf7e754203935128eb7 (diff)
make monitor service include the nodes that are of a similar type (e.g. production or local).
-rw-r--r--provider_base/common.json3
-rw-r--r--provider_base/services/monitor.json2
-rw-r--r--provider_base/tags/production.json3
3 files changed, 6 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 8ffe8cd4..8e4dc6e7 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -25,8 +25,9 @@
"ca_cert": "= try_file :ca_cert"
},
"local": false,
+ "production": false,
"service_type": "internal_service",
"development": {
- "site_config": true
+ "site_config": true
}
}
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json
index 09972308..f5e4d922 100644
--- a/provider_base/services/monitor.json
+++ b/provider_base/services/monitor.json
@@ -1,6 +1,6 @@
{
"nagios": {
"nagiosadmin_pw": "= secret :nagios_admin_password",
- "hosts": "= nodes['production' => true].fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
+ "hosts": "= nodes_like_me.fields('domain.internal', 'ip_address', 'services', 'openvpn.gateway_address')"
}
}
diff --git a/provider_base/tags/production.json b/provider_base/tags/production.json
new file mode 100644
index 00000000..b35c0650
--- /dev/null
+++ b/provider_base/tags/production.json
@@ -0,0 +1,3 @@
+{
+ "production": true
+} \ No newline at end of file