Ticket #2858: hostname.diff

global_settings.py

@@ -1 +1 @@
 # Default Django settings. Override these with settings in the module
 # pointed-to by the DJANGO_SETTINGS_MODULE environment variable.
 
+import socket
+
 # This is defined here as a do-nothing function because we can't import
 # django.utils.translation -- that module depends on the settings.
 gettext_noop = lambda s: s
@@ -88 +90 @@
 DEFAULT_CHARSET = 'utf-8'
 
 # E-mail address that error messages come from.
-SERVER_EMAIL = 'root@localhost'
+try:
+    SERVER_EMAIL = 'root@%s' % socket.gethostname()
+except:
+    SERVER_EMAIL = 'root@localhost'
 
 # Whether to send broken-link e-mails.
 SEND_BROKEN_LINK_EMAILS = False
@@ -146 +151 @@
 
 # Default e-mail address to use for various automated correspondence from
 # the site managers.
-DEFAULT_FROM_EMAIL = 'webmaster@localhost'
+try:
+    DEFAULT_FROM_EMAIL = 'webmaster@%s' % socket.gethostname()
+except:
+    DEFAULT_FROM_EMAIL = 'webmaster@localhost'
 
 # Subject-line prefix for email messages send with django.core.mail.mail_admins
 # or ...mail_managers.  Make sure to include the trailing space.