summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/defaults.yml24
-rw-r--r--config/locales/users.en.yml5
2 files changed, 26 insertions, 3 deletions
diff --git a/config/defaults.yml b/config/defaults.yml
index b14955c..ca5107f 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -34,13 +34,29 @@ common: &common
token_expires_after: 60
# handles that will be blocked from being used as logins or email aliases
# in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
- handle_blacklist: ['certmaster', 'ssladmin', 'arin-admin', 'administrator', 'www-data', 'maildrop', 'postmaster', 'admin', 'contact', 'info']
+ handle_blacklist:
+ - certmaster
+ - ssladmin
+ - arin-admin
+ - administrator
+ - www-data
+ - maildrop
+ - postmaster
+ - admin
+ - contact
+ - info
+ - noreply
+ - robot
+ - helpdesk
+ - help
+ - tickets
+ - owner
# handles that will be allowed despite being in /etc/passwd or rfc2142
handle_whitelist: []
# actions enabled in the account settings
# see /users/app/views/users/_edit.html.haml for a list.
- user_actions: ['destroy_account']
- admin_actions: ['change_pgp_key', 'change_service_level', 'destroy_account']
+ user_actions: ['contact_email', 'destroy_account']
+ admin_actions: ['contact_email', 'change_pgp_key', 'change_service_level', 'destroy_account']
billing: ~
default_locale: :en
available_locales:
@@ -54,6 +70,8 @@ common: &common
soledad-service: 'public/1/config/soledad-service.json'
eip-service: 'public/1/config/eip-service.json'
smtp-service: 'public/1/config/smtp-service.json'
+ mailer:
+ from_address: 'noreply'
service_levels: &service_levels
service_levels:
diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml
index bebf1cf..89307dd 100644
--- a/config/locales/users.en.yml
+++ b/config/locales/users.en.yml
@@ -39,6 +39,11 @@ en:
payment_one_month_warning: "We hope you have been enjoying this service this past month. Please sign up to pay within the next month, by %{date_in_one_month}. Directions for payment are available at INSERT_URL"
bye: "Goodbye!"
bye_message: "So long and thanks for all the fish."
+ contact_email: "Contact Email"
+ contact_email_info: >
+ You may specify an email address where we can contact you if there is a
+ problem with your account. For privacy reasons, you might prefer to leave
+ this empty.
#
# overview