summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-27 13:27:00 +0100
committervarac <varacanero@zeromail.org>2014-02-27 18:13:05 +0100
commit8882880d5959f14a7edb94ca95ebcdd15cbc3f51 (patch)
treead205fa77f993fce3cb1b6ebeecfe1cd67e11bd2
parent66cc1345c3af4e814d98c8e4b90d90158ac9d399 (diff)
provide nagios_test_pw in hiera files
-rw-r--r--provider_base/services/couchdb.json3
-rw-r--r--provider_base/services/webapp.json3
2 files changed, 5 insertions, 1 deletions
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 0cb044ef..5f1b5381 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -48,6 +48,9 @@
"password": "= secret :couch_webapp_password",
"salt": "= hex_secret :couch_webapp_password_salt, 128"
}
+ },
+ "webapp": {
+ "nagios_test_pw": "= secret :nagios_test_password"
}
}
}
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 08c7c5b0..b1f03f06 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -15,7 +15,8 @@
"source": "https://leap.se/git/leap_web",
"revision": "origin/master"
},
- "client_version": "= global.provider.client_version"
+ "client_version": "= global.provider.client_version",
+ "nagios_test_pw": "= secret :nagios_test_password"
},
"stunnel": {
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"