From d7a94608f3111edc8765240c1d9e44bbe715d1c7 Mon Sep 17 00:00:00 2001 From: Ricky Zhou Date: Tue, 4 Mar 2008 21:01:08 -0500 Subject: [PATCH] Make email host configurable, set to publictest10 so that we don't bother real group sponsors. --- fas/fas/config/app.cfg | 2 ++ fas/fas/group.py | 3 ++- fas/fas/templates/user/view.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fas/fas/config/app.cfg b/fas/fas/config/app.cfg index eb6fb4e..0aafe08 100644 --- a/fas/fas/config/app.cfg +++ b/fas/fas/config/app.cfg @@ -154,6 +154,8 @@ identity.saprovider.model.group="fas.model.Groups" # identity.saprovider.encryption_algorithm=None accounts_mail = "accounts@fedoraproject.org" +#email_host = "fedoraproject.org" +email_host = "publictest10.fedoraproject.org" gpgexec = "/usr/bin/gpg" gpghome = "/srv/fedora-infrastructure/fas/gnupg" diff --git a/fas/fas/group.py b/fas/fas/group.py index 0d9a941..fa27c3d 100644 --- a/fas/fas/group.py +++ b/fas/fas/group.py @@ -287,7 +287,8 @@ class Group(controllers.Controller): # TODO: How do we handle gettext calls for these kinds of emails? # TODO: CC to right place, put a bit more thought into how to most elegantly do this - message = turbomail.Message(config.get('accounts_mail'), '%s-sponsors@fedoraproject.org' % group.name, \ + # TODO: Maybe that @fedoraproject.org (and even -sponsors) should be configurable somewhere? + message = turbomail.Message(config.get('accounts_mail'), '%(group)s-sponsors@%(host)s' % {'group': group.name, 'host': config.get('email_host')}, \ "Fedora '%(group)s' sponsor needed for %(user)s" % {'user': target.username, 'group': group.name}) url = config.get('base_url_filter.base_url') + turbogears.url('/group/edit/%s' % groupname) diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html index ced3f25..290124e 100644 --- a/fas/fas/templates/user/view.html +++ b/fas/fas/templates/user/view.html @@ -54,7 +54,7 @@
${_('Status:')}
${_('Approved')} - ${_('Unapproved')} + ${_('None')}
${_('Tools:')}