When looking for a specific revision for a draft, which could be a quite old revision, look in the aggregate draft archive which should contain all available versions of drafts, also those which are missing in the official secretariat archive. Fixes issue #1729.

- Legacy-Id: 9713

ietf/doc/tests.py

@@ -336,6 +336,7 @@ Man                    Expires September 22, 2015               [Page 3]
         if not os.path.exists(self.id_dir):
             os.mkdir(self.id_dir)
         settings.INTERNET_DRAFT_PATH = self.id_dir
+        settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR = self.id_dir
         f = open(os.path.join(self.id_dir, 'draft-ietf-mars-test-01.txt'), 'w')
         f.write(self.draft_text)
         f.close()

ietf/doc/views_doc.py

@@ -201,7 +201,7 @@ def document_main(request, name, rev=None):
         else:
             filename = "%s-%s.txt" % (draft_name, doc.rev)
 
-            content = get_document_content(filename, os.path.join(settings.INTERNET_DRAFT_PATH, filename),
+            content = get_document_content(filename, os.path.join(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR, filename),
                                            split_content, markup=True)
 
             # file types

ietf/settings.py

@@ -347,7 +347,11 @@ IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt'
 IESG_ROLL_CALL_FILE = '/a/www/www6/iesg/internal/rollcall.txt'
 IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt'
 IESG_WG_EVALUATION_DIR = "/a/www/www6/iesg/evaluation"
+# Move drafts to this directory when they expire
 INTERNET_DRAFT_ARCHIVE_DIR = '/a/www/www6s/draft-archive'
+# The following directory contains linked copies of all drafts, but don't
+# write anything to this directory -- its content is maintained by ghostlinkd:
+INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/a/www/www6s/archive/id'
 MEETING_RECORDINGS_DIR = '/a/www/audio'
 
 # Mailing list info URL for lists hosted on the IETF servers