Retire @salilab.org email domain

Author: benmwebb

examples/example.conf

@@ -1,5 +1,5 @@
 [general]
-admin_email: modfoo-admin@salilab.org
+admin_email: modfoo-admin@ucsf.edu
 socket: /modbase1/home/modfoo/modfoo.socket
 service_name: ModFoo
 urltop: http://modbase.compbio.ucsf.edu/modfoo

perl/saliweb/frontend.pm

@@ -427,7 +427,7 @@ sub _admin_email {
     } else {
         # If an error occurred before we managed to read the configuration file,
         # fall back to bothering the sysadmins
-        return "system\@salilab.org";
+        return "salilab-system\@ucsf.edu";
     }
 }
 

python/saliweb/frontend/__init__.py

@@ -209,7 +209,7 @@ def _setup_email_logging(app):
     if not app.debug:
         mail_handler = logging.handlers.SMTPHandler(
             mailhost=('localhost', 25),
-            fromaddr='no-reply@salilab.org',
+            fromaddr='no-reply@ucsf.edu',
             toaddrs=[app.config['ADMIN_EMAIL']],
             subject='%s web service error' % app.config['SERVICE_NAME'])
         mail_handler.setLevel(logging.ERROR)

test/frontend/frontend.pl

@@ -52,7 +52,7 @@ BEGIN
 
 # Test _admin_email method
 {
-    my $default = 'system@salilab.org';
+    my $default = 'salilab-system@ucsf.edu';
     my $self = {};
     bless($self, 'saliweb::frontend');
     is($self->_admin_email, $default, 'admin_email (default 1)');
@@ -841,8 +841,10 @@ END
     $self->_email_admin_fatal_error($exc);
     my $email = $MIME::Lite::last_email;
     $MIME::Lite::last_email = undef;
-    is($email->{From}, '[email protected]', 'email_admin_fatal_error (from)');
-    is($email->{To}, '[email protected]', '                        (to)');
+    is($email->{From}, '[email protected]',
+       'email_admin_fatal_error (from)');
+    is($email->{To}, '[email protected]',
+       '                        (to)');
     is($email->{Subject}, 'Fatal error in unittest-server web service frontend',
        '                        (subject)');
     like($email->{Data},