Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Make email host configurable, set to publictest10 so that we don't bother real group sponsors.

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2008-03-04 21:01:08 -05:00
parent 5c3e9b9f26
commit d7a94608f3
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fas/fas/config/app.cfg
View file

@ -154,6 +154,8 @@ identity.saprovider.model.group="fas.model.Groups"
# identity.saprovider.encryption_algorithm=None # identity.saprovider.encryption_algorithm=None
accounts_mail = "accounts@fedoraproject.org" accounts_mail = "accounts@fedoraproject.org"
#email_host = "fedoraproject.org"
email_host = "publictest10.fedoraproject.org"
gpgexec = "/usr/bin/gpg" gpgexec = "/usr/bin/gpg"
gpghome = "/srv/fedora-infrastructure/fas/gnupg" gpghome = "/srv/fedora-infrastructure/fas/gnupg"

3
fas/fas/group.py
View file

@ -287,7 +287,8 @@ class Group(controllers.Controller):
# TODO: How do we handle gettext calls for these kinds of emails? # 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 # 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}) "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) url = config.get('base_url_filter.base_url') + turbogears.url('/group/edit/%s' % groupname)

2
fas/fas/templates/user/view.html
View file

@ -54,7 +54,7 @@
<dt>${_('Status:')}</dt> <dt>${_('Status:')}</dt>
<dd> <dd>
<span class="approved" py:if="group in person.approved_memberships">${_('Approved')}</span> <span class="approved" py:if="group in person.approved_memberships">${_('Approved')}</span>
<span class="unapproved" py:if="group in person.unapproved_memberships">${_('Unapproved')}</span> <span class="unapproved" py:if="group in person.unapproved_memberships">${_('None')}</span>
</dd> </dd>
<dt>${_('Tools:')}</dt> <dt>${_('Tools:')}</dt>
<dd> <dd>