From 7b3a62e7c06409cb0a37809f3a804dba04e47aaf Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 12 Sep 2013 20:10:09 +0000 Subject: [PATCH] Moved IANA addresses that were used in more than one place into settings (which addresses a typo in one of the places the IANA eval email address was used). Fixes bug 1124 Branch ready for merge - Legacy-Id: 6151 --- ietf/doc/views_ballot.py | 4 ++-- ietf/doc/views_conflict_review.py | 2 +- ietf/doc/views_draft.py | 2 +- ietf/settings.py | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py index 01997ad83..2d3297f39 100644 --- a/ietf/doc/views_ballot.py +++ b/ietf/doc/views_ballot.py @@ -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 ", "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 ", "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 diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py index 6dc74fb68..dfc66ddd8 100644 --- a/ietf/doc/views_conflict_review.py +++ b/ietf/doc/views_conflict_review.py @@ -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): diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py index 24ae62f08..d04b17f20 100644 --- a/ietf/doc/views_draft.py +++ b/ietf/doc/views_draft.py @@ -1063,7 +1063,7 @@ def request_publication(request, name): send_mail_message(request, m) # IANA copy - m.to = "IANA " + 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()) diff --git a/ietf/settings.py b/ietf/settings.py index d3b7367cc..443e00183 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -281,6 +281,9 @@ else: IPR_EMAIL_TO = ['ietf-ipr@ietf.org', ] DOC_APPROVAL_EMAIL_CC = ["RFC Editor ", ] +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"