diff --git a/README.md b/README.md index bff43b546..397354eca 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ that quotes need not be provided, except in the list variable. redis_passwd: password_here from_email: you@email.com admin_email: you@email.com + email_admin_list: ["you@email.com"] request_approval_cc_list: ["you@email.com"] ``` 8. Provision the VM. This should run the Ansible playbook. Expect this to take diff --git a/bootstrap/ansible/main.copyme b/bootstrap/ansible/main.copyme index 343ca8cbb..cd0c670e8 100644 --- a/bootstrap/ansible/main.copyme +++ b/bootstrap/ansible/main.copyme @@ -173,8 +173,12 @@ sentry_dsn: "" # # TODO: For LRC, use the substring 'MyLRC'. # email_subject_prefix: '[MyBRC-User-Portal]' +# # A list of admin email addresses to be notified about new requests and other +# # events. +# # TODO: Set these addresses to yours. +# email_admin_list: [] # # A list of email addresses to CC when certain requests are processed. -# # TODO: Set this address to yours. +# # TODO: Set these addresses to yours. # request_approval_cc_list: [] ############################################################################### @@ -224,9 +228,13 @@ sentry_dsn: "" # # TODO: For LRC, use the substring 'MyLRC'. # email_subject_prefix: '[MyBRC-User-Portal]' +# # A list of admin email addresses to be notified about new requests and other +# # events. +# # TODO: Set these addresses to yours. +# email_admin_list: [] # # A list of email addresses to CC when certain requests are processed. -# # TODO: Set this address to yours. -# request_approval_cc_list: ['wfeinstein@lbl.gov'] +# # TODO: Set these addresses to yours. +# request_approval_cc_list: [] ############################################################################### # dev_settings @@ -272,6 +280,10 @@ sentry_dsn: "" # # TODO: For LRC, use the substring 'MyLRC'. # email_subject_prefix: '[MyBRC-User-Portal]' +# # A list of admin email addresses to be notified about new requests and other +# # events. +# # TODO: Set these addresses to yours. +# email_admin_list: ['you@email.com'] # # A list of email addresses to CC when certain requests are processed. -# # TODO: Set this address to yours. +# # TODO: Set these addresses to yours. # request_approval_cc_list: ['you@email.com'] diff --git a/bootstrap/ansible/settings_template.tmpl b/bootstrap/ansible/settings_template.tmpl index 6280f8c2d..21b2ddfb1 100644 --- a/bootstrap/ansible/settings_template.tmpl +++ b/bootstrap/ansible/settings_template.tmpl @@ -21,7 +21,9 @@ CENTER_PROJECT_RENEWAL_HELP_URL = CENTER_BASE_URL + '/help' EMAIL_PORT = {{ email_port }} EMAIL_SUBJECT_PREFIX = '{{ email_subject_prefix }}' -EMAIL_ADMIN_LIST = ['admin@{{ hostname }}'] +# A list of admin email addresses to be notified about new requests and other +# events. +EMAIL_ADMIN_LIST = {{ email_admin_list }} or ['admin@{{ hostname }}'] EMAIL_SENDER = '{{ from_email }}' EMAIL_TICKET_SYSTEM_ADDRESS = 'help@{{ hostname }}' EMAIL_DIRECTOR_EMAIL_ADDRESS = 'director@{{ hostname }}' diff --git a/coldfront/config/test_settings.py.sample b/coldfront/config/test_settings.py.sample index 825cdea99..4d92b5511 100644 --- a/coldfront/config/test_settings.py.sample +++ b/coldfront/config/test_settings.py.sample @@ -21,6 +21,8 @@ CENTER_PROJECT_RENEWAL_HELP_URL = CENTER_BASE_URL + '/help' EMAIL_PORT = 1025 EMAIL_SUBJECT_PREFIX = '[MyBRC-User-Portal]' +# A list of admin email addresses to be notified about new requests and other +# events. EMAIL_ADMIN_LIST = ['admin@localhost'] EMAIL_SENDER = 'test@test.test' EMAIL_TICKET_SYSTEM_ADDRESS = 'help@localhost'