diff options
| author | elijah <elijah@riseup.net> | 2013-07-29 01:10:33 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-07-30 16:44:03 -0700 |
| commit | 95fc96fc7642e389172b02cb8ef7d4b7689cb7df (patch) | |
| tree | c2952d8afe373230faf3dbc25d909297904e3bbd | |
| parent | b87bd57ad010ee6f091f77b8b1f653afafc0e4c7 (diff) | |
webapp - use hiera config "webapp.admins" for the list of admin usernames, default to empty list.
| -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') %> |