CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-24 21:08:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a site-specific Zulip Admin email in django error pages

Browse Source 
(imported from commit 2d5415d7cd81befc3051b5de3835c0cd258b6375)
This commit is contained in:
Leo Franchi 2013-11-04 13:37:05 -05:00
parent 64289b5630
commit 6765ec0795
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/404.html
View File

@ -9,6 +9,6 @@
<p>We know this is stressful, but we still love you.</p>
<p>If you'd like, you can <a href="mailto:support@zulip.com?Subject=404%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20404%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
<p>If you'd like, you can <a href="mailto:{{ zulip_admin }}?Subject=404%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20404%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
{% endblock %}

2
templates/500.html
View File

@ -14,6 +14,6 @@
<p>Well oops. This one's probably our fault. Sorry about that!</p>
<p>If you'd like, you can <a href="mailto:support@zulip.com?Subject=500%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20500%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
<p>If you'd like, you can <a href="mailto:{{ zulip_admin }}?Subject=500%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20500%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
{% endblock %}

1
zerver/context_processors.py
View File

@ -7,6 +7,7 @@ def add_settings(request):
return {
'full_navbar': settings.FULL_NAVBAR,
'local_server': settings.LOCAL_SERVER,
'zulip_admin': settings.ZULIP_ADMINISTRATOR,
}
def add_metrics(request):

2
zproject/local_settings.py
View File

@ -159,3 +159,5 @@ NAGIOS_RECEIVE_BOT = 'othello@zulip.com'
# Our internal deployment has nagios checks for both staging and prod
NAGIOS_STAGING_SEND_BOT = 'iago@zulip.com'
NAGIOS_STAGING_RECEIVE_BOT = 'cordelia@zulip.com'
ZULIP_ADMINISTRATOR = 'support@zulip.com'

3
zproject/local_settings_template.py
View File

@ -3,6 +3,9 @@
# This is the user-accessible Zulip hostname for this installation
EXTERNAL_HOST = ''
# This is the Zulip Administrator email address
ZULIP_ADMINISTRATOR = ''
# These credentials are for communication with the central Zulip deployment manager
DEPLOYMENT_ROLE_NAME = ''
DEPLOYMENT_ROLE_KEY = ''

3
zproject/settings.py
View File

@ -245,7 +245,8 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'ERROR_BOT': None,
'NEW_USER_BOT': None,
'NAGIOS_STAGING_SEND_BOT': None,
'NAGIOS_STAGING_RECEIVE_BOT': None
'NAGIOS_STAGING_RECEIVE_BOT': None,
'ZULIP_ADMINISTRATOR': ''
}
for setting_name, setting_val in DEFAULT_SETTINGS.iteritems():