diff options
| author | varac <varacanero@zeromail.org> | 2015-09-10 14:52:32 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-09-10 14:52:32 +0200 |
| commit | c0fb606ab22646eafb61059a9ea30ac919ec2d04 (patch) | |
| tree | 63afb7b229942a50d8fe498bb528c93cf8c5797a /provider_base | |
| parent | 7af30ee28ee492f77244b83b342d0ab8688a28d1 (diff) | |
| parent | f93e6904fe2abca3cfc7a93a08892dbdcea97327 (diff) | |
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/services/webapp.json | 2 | ||||
| -rw-r--r-- | provider_base/tags/development.json | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index dbcfe0a6..039b1c0b 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -20,7 +20,7 @@ "allow_anonymous_certs": "= provider.service.allow_anonymous", "allow_registration": "= provider.service.allow_registration", "default_service_level": "= provider.service.default_service_level", - "service_levels": "= provider.service.levels", + "service_levels": "= service_levels()", "secret_token": "= secret :webapp_secret_token", "api_version": 1, "secure": false, diff --git a/provider_base/tags/development.json b/provider_base/tags/development.json index d9c2c007..caf18e9d 100644 --- a/provider_base/tags/development.json +++ b/provider_base/tags/development.json @@ -1,7 +1,3 @@ { - "environment": "development", - "domain": { - "full_suffix": "= 'dev.' + provider.domain", - "internal_suffix": "= 'dev.' + provider.domain_internal" - } + "environment": "development" }
\ No newline at end of file |