diff options
| author | varac <varacanero@zeromail.org> | 2014-03-15 10:24:20 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-03-15 10:24:20 +0100 |
| commit | 49ab166fbe013da6de301a7bb8d1a5128207c3b5 (patch) | |
| tree | 61234b2f1f49fbcfb00ef993a3c25823bbc604fe /provider_base/services/webapp.json | |
| parent | 2f1b09caa23d74b3b778dd285a3456c142d052f8 (diff) | |
| parent | 18121335c200b86a39f83a7cd240258c40a81f4e (diff) | |
Merge remote-tracking branch 'elijah/feature/provider-env' into 0.6
Diffstat (limited to 'provider_base/services/webapp.json')
| -rw-r--r-- | provider_base/services/webapp.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index f7abdffd..29c0cbf9 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -8,10 +8,10 @@ "salt": "= hex_secret :couch_webapp_password_salt, 128" }, "customization_dir": "= file_path 'webapp'", - "client_certificates": "= global.provider.ca.client_certificates", - "allow_limited_certs": "= global.provider.service.allow_limited_bandwidth", - "allow_unlimited_certs": "= global.provider.service.allow_unlimited_bandwidth", - "allow_anonymous_certs": "= global.provider.service.allow_anonymous", + "client_certificates": "= provider.ca.client_certificates", + "allow_limited_certs": "= provider.service.allow_limited_bandwidth", + "allow_unlimited_certs": "= provider.service.allow_unlimited_bandwidth", + "allow_anonymous_certs": "= provider.service.allow_anonymous", "secret_token": "= secret :webapp_secret_token", "api_version": 1, "secure": false, @@ -19,7 +19,7 @@ "source": "https://leap.se/git/leap_web", "revision": "origin/master" }, - "client_version": "= global.provider.client_version", + "client_version": "= provider.client_version", "nagios_test_user": { "username": "nagios_test", "password": "= secret :nagios_test_password" |