Moved settings for RFC-Editor sync to settings.py.

 - Legacy-Id: 5775

Author: levkowetz

ietf/idrfc/views_ballot.py

@@ -1020,7 +1020,7 @@ def approve_ballotREDESIGN(request, name):
         if new_state.slug == "ann" and not request.REQUEST.get("skiprfceditorpost"):
             # start by notifying the RFC Editor
             import ietf.sync.rfceditor
-            response, error = ietf.sync.rfceditor.post_approved_draft(ietf.sync.rfceditor.POST_APPROVED_DRAFT_URL, doc.name)
+            response, error = ietf.sync.rfceditor.post_approved_draft(settings.RFC_EDITOR_SYNC_NOTIFICATION_URL, doc.name)
             if error:
                 return render_to_response('doc/rfceditor_post_approved_draft_failed.html',
                                   dict(name=doc.name,

ietf/idrfc/views_edit.py

@@ -1091,7 +1091,7 @@ def request_publication(request, name):
             if not request.REQUEST.get("skiprfceditorpost"):
                 # start by notifying the RFC Editor
                 import ietf.sync.rfceditor
-                response, error = ietf.sync.rfceditor.post_approved_draft(ietf.sync.rfceditor.POST_APPROVED_DRAFT_URL, doc.name)
+                response, error = ietf.sync.rfceditor.post_approved_draft(settings.RFC_EDITOR_SYNC_NOTIFICATION_URL, doc.name)
                 if error:
                     return render_to_response('doc/rfceditor_post_approved_draft_failed.html',
                                       dict(name=doc.name,

ietf/settings.py

@@ -278,6 +278,9 @@
 IANA_SYNC_PROTOCOLS_URL = "http://www.iana.org/protocols/"
 
 RFC_EDITOR_SYNC_PASSWORD="secret"
+RFC_EDITOR_SYNC_NOTIFICATION_URL = "http://www.rfc-editor.org/parser/parser.php"
+RFC_EDITOR_QUEUE_URL = "http://www.rfc-editor.org/queue2.xml"
+RFC_EDITOR_INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml"
 
 # Liaison Statement Tool settings
 LIAISON_UNIVERSAL_FROM = 'Liaison Statement Management Tool <lsmt@' + IETF_DOMAIN + '>'

ietf/sync/rfceditor.py

@@ -10,9 +10,9 @@
 from ietf.name.models import *
 from ietf.doc.utils import add_state_change_event
 
-QUEUE_URL = "http://www.rfc-editor.org/queue2.xml"
-INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml"
-POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php"
+#QUEUE_URL = "http://www.rfc-editor.org/queue2.xml"
+#INDEX_URL = "http://www.rfc-editor.org/rfc/rfc-index.xml"
+#POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php"
 
 MIN_QUEUE_RESULTS = 10
 MIN_INDEX_RESULTS = 5000

ietf/sync/views.py

@@ -64,8 +64,8 @@ def notify(request, org, notification):
     known_notifications = {
         "protocols": "an added reference to an RFC at <a href=\"%s\">the IANA protocols page</a>" % settings.IANA_SYNC_PROTOCOLS_URL,
         "changes": "new changes at <a href=\"%s\">the changes JSON dump</a>" % settings.IANA_SYNC_CHANGES_URL,
-        "queue": "new changes to <a href=\"%s\">queue2.xml</a>" % rfceditor.QUEUE_URL,
-        "index": "new changes to <a href=\"%s\">rfc-index.xml</a>" % rfceditor.INDEX_URL,
+        "queue": "new changes to <a href=\"%s\">queue2.xml</a>" % settings.RFC_EDITOR_QUEUE_URL,
+        "index": "new changes to <a href=\"%s\">rfc-index.xml</a>" % settings.RFC_EDITOR_INDEX_URL,
         }
 
     if notification not in known_notifications: