diff options
| author | Azul <azul@riseup.net> | 2014-07-29 13:03:42 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2014-07-29 13:03:42 +0200 |
| commit | 828ff89b9bbce6471e1d2ad1a10dd095fa498081 (patch) | |
| tree | 25e9efd7513e9b613c60dc9d4ff86b74143c10b2 | |
| parent | d341c90c1493a78ed0ee2e216797651ff0aebfa9 (diff) | |
| parent | 9ab38e0551fe3210f57be2889e70db4aa2b4cc2f (diff) | |
Merge remote-tracking branch 'fbernitt/issue_5217_allow_registration' into develop
| -rw-r--r-- | provider_base/services/webapp.json | 1 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index c1e3791f..1af95022 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -13,6 +13,7 @@ "allow_limited_certs": "= provider.service.allow_limited_bandwidth", "allow_unlimited_certs": "= provider.service.allow_unlimited_bandwidth", "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", "secret_token": "= secret :webapp_secret_token", diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 8faf76f4..ef139404 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -18,9 +18,10 @@ production: minimum_client_version: "<%= @webapp['client_version']['min'] %>" default_service_level: "<%= @webapp['default_service_level'] %>" service_levels: <%= @webapp['service_levels'].to_json %> + allow_registration: <%= @provider['allow_registration'].inspect %> <%- if @webapp['engines'] && @webapp['engines'].any? -%> engines: <%- @webapp['engines'].each do |engine| -%> - <%= engine %> <%- end -%> -<%- end -%>
\ No newline at end of file +<%- end -%> |