diff options
| author | Azul <azul@riseup.net> | 2014-04-18 12:59:59 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2014-04-24 21:03:21 +0200 |
| commit | b9369292cb19f97aafaaaac9f89bf2374487936b (patch) | |
| tree | 46a326044d09d390221b29b849a3a0e769d544ec | |
| parent | 640c63ef377abe7a4461ab417c27057313613830 (diff) | |
bring service_levels into webapp config - #5527
including the default_service_level
| -rw-r--r-- | provider_base/services/webapp.json | 2 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 29c0cbf9..6b746fe4 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -12,6 +12,8 @@ "allow_limited_certs": "= provider.service.allow_limited_bandwidth", "allow_unlimited_certs": "= provider.service.allow_unlimited_bandwidth", "allow_anonymous_certs": "= provider.service.allow_anonymous", + "default_service_level": "= provider.service.default_service_level", + "service_levels": "= provider.service.levels", "secret_token": "= secret :webapp_secret_token", "api_version": 1, "secure": false, diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 98f8564e..aa8ac6ab 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -15,3 +15,5 @@ production: limited_cert_prefix: "<%= cert_options['limited_prefix'] %>" unlimited_cert_prefix: "<%= cert_options['unlimited_prefix'] %>" minimum_client_version: "<%= @webapp['client_version']['min'] %>" + default_service_level: "<%= @webapp['default_service_level'] %>" + service_levels: "<%= @webapp['service_levels'].inspect %>" |