diff options
| author | varac <varacanero@zeromail.org> | 2014-02-27 22:43:31 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-27 22:43:31 +0100 |
| commit | c16592b6ac1e56bb9955a337b0564686c9e18e20 (patch) | |
| tree | 0427d06dc8fbe8ef659e63ba65b727f9e74dd80a /provider_base/services | |
| parent | 0cd0076f945c0e02bfdc50ff483ceebceec131e2 (diff) | |
| parent | 2209afd630a75335e26516c6d9fa1c796bca8a49 (diff) | |
Merge branch 'webapp_check' into 0.6
Diffstat (limited to 'provider_base/services')
| -rw-r--r-- | provider_base/services/couchdb.json | 3 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 6 |
2 files changed, 8 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 8974f851..f7abdffd 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -19,7 +19,11 @@ "source": "https://leap.se/git/leap_web", "revision": "origin/master" }, - "client_version": "= global.provider.client_version" + "client_version": "= global.provider.client_version", + "nagios_test_user": { + "username": "nagios_test", + "password": "= secret :nagios_test_password" + } }, "stunnel": { "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" |