diff options
| author | elijah <elijah@riseup.net> | 2014-10-29 15:20:54 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-10-29 15:20:54 -0700 |
| commit | d3e24760b33d6ae20f153d3c144d7d443fb0b69e (patch) | |
| tree | 037f8c8e8dd15f8de34b700e221f2289f89350ac | |
| parent | f77177e67820e85e24b0c109506f05be404e005a (diff) | |
added webapp.forbidden_usernames property to allow configuration of usernames to block.
| -rw-r--r-- | provider_base/services/webapp.json | 1 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 3af0dade..44b5fa14 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -1,6 +1,7 @@ { "webapp": { "admins": [], + "forbidden_usernames": ["admin", "administrator", "arin-admin", "certmaster", "contact", "info", "maildrop", "postmaster", "ssladmin", "www-data"], "domain": "= domain.full_suffix", "modules": ["user", "billing", "help"], "couchdb_webapp_user": { diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 9205438b..0c75f3ca 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -19,6 +19,7 @@ production: default_service_level: "<%= @webapp['default_service_level'] %>" service_levels: <%= @webapp['service_levels'].to_json %> allow_registration: <%= @webapp['allow_registration'].inspect %> + handle_blacklist: <%= @webapp['forbidden_usernames'].inspect %> <%- if @webapp['engines'] && @webapp['engines'].any? -%> engines: <%- @webapp['engines'].each do |engine| -%> |