diff options
| -rw-r--r-- | provider_base/services/webapp.json | 1 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 2 | 
2 files changed, 2 insertions, 1 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index ed039b01..b9e823da 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -1,5 +1,6 @@  {    "webapp": { +    "admins": [],      "modules": ["user", "billing", "help"],      "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",  //    "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]", diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 8b4b3bbe..05d62d41 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -1,6 +1,6 @@  <%- cert_options = @webapp['client_certificates'] -%>  production: -  admins: [admin] +  admins: <%= @webapp['admins'].inspect %>    domain: <%= @provider_domain %>    force_ssl: <%= @webapp['secure'] %>    client_ca_key: <%= scope.lookupvar('site_webapp::client_ca::key_path') %>  | 
