altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in a fix from rjsparks@nostrum.com for incorrect IANA notification email addresses.

Browse source 
- Legacy-Id: 6152
This commit is contained in:
Henrik Levkowetz 2013-09-13 22:23:55 +00:00
parent a4fc386e2e
commit 71f85f96c7
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/doc/views_ballot.py
View file

@ -546,7 +546,7 @@ def ballot_writeupnotes(request, name):
msg = generate_issue_ballot_mail(request, doc, ballot)
send_mail_preformatted(request, msg)
send_mail_preformatted(request, msg, extra=extra_automation_headers(doc),
override={ "To": "IANA <drafts-eval@icann.org>", "CC": None, "Bcc": None , "Reply-To": None})
override={ "To": "IANA <%s>"%settings.IANA_EVAL_EMAIL, "CC": None, "Bcc": None , "Reply-To": None})
e = DocEvent(doc=doc, by=login)
e.by = login
@ -716,7 +716,7 @@ def approve_ballot(request, name):
if action == "to_announcement_list":
send_mail_preformatted(request, announcement, extra=extra_automation_headers(doc),
override={ "To": "IANA <drafts-approval@icann.org>", "CC": None, "Bcc": None, "Reply-To": None})
override={ "To": "IANA <%s>"%settings.IANA_APPROVE_EMAIL, "CC": None, "Bcc": None, "Reply-To": None})
msg = infer_message(announcement)
msg.by = login

2
ietf/doc/views_conflict_review.py
View file

@ -100,7 +100,7 @@ def send_conflict_eval_email(request,review):
send_mail_preformatted(request,msg)
email_iana(request,
review.relateddocument_set.get(relationship__slug='conflrev').target.document,
'draft-eval@icann.org',
settings.IANA_EVAL_EMAIL,
msg)
class UploadForm(forms.Form):

2
ietf/doc/views_draft.py
View file

@ -1063,7 +1063,7 @@ def request_publication(request, name):
send_mail_message(request, m)
# IANA copy
m.to = "IANA <drafts-approval@icann.org>"
m.to = settings.IANA_APPROVE_EMAIL
send_mail_message(request, m, extra=extra_automation_headers(doc))
e = DocEvent(doc=doc, type="requested_publication", by=request.user.get_profile())

3
ietf/settings.py
View file

@ -281,6 +281,9 @@ else:
IPR_EMAIL_TO = ['ietf-ipr@ietf.org', ]
DOC_APPROVAL_EMAIL_CC = ["RFC Editor <rfc-editor@rfc-editor.org>", ]
IANA_EVAL_EMAIL = "drafts-eval@icann.org"
IANA_APPROVE_EMAIL = "drafts-approval@icann.org"
# Put real password in settings_local.py
IANA_SYNC_PASSWORD = "secret"
IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes"