diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 881a2fde9..93f20f91b 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -293,7 +293,7 @@ class MeetingTests(TestCase): self.assertEqual(r.status_code,200) self.assertTrue(all([x in unicontent(r) for x in ['var all_items', 'maximize', 'draw_calendar', ]])) - @override_settings(SERVE_MEETING_MATERIALS_LOCALLY=False) + @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=False) def test_materials_through_cdn(self): meeting = make_meeting_test_data() session = Session.objects.filter(meeting=meeting, group__acronym="mars").first() @@ -319,7 +319,7 @@ class MeetingTests(TestCase): self.do_test_materials(meeting, session) - @override_settings(SERVE_MEETING_MATERIALS_LOCALLY=True) + @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True) def do_test_materials(self, meeting, session): self.write_materials_files(meeting, session) @@ -2536,7 +2536,7 @@ class MaterialsTests(TestCase): r = self.client.post(url,dict(file=test_file,apply_to_all=False)) self.assertEqual(r.status_code, 410) - @override_settings(SERVE_MEETING_MATERIALS_LOCALLY=True) + @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True) def test_upload_minutes_agenda_interim(self): session=SessionFactory(meeting__type_id='interim') for doctype in ('minutes','agenda'): diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 10c883106..23813b614 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -221,7 +221,7 @@ def materials_document(request, document, num=None, ext=None): if not os.path.exists(filename): raise Http404("File not found: %s" % filename) - if settings.SERVE_MEETING_MATERIALS_LOCALLY : + if settings.MEETING_MATERIALS_SERVE_LOCALLY : with io.open(filename, 'rb') as file: bytes = file.read() diff --git a/ietf/settings.py b/ietf/settings.py index 81b6e6745..2aece0f5f 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -691,48 +691,6 @@ DOC_HREFS = { "liai-att": "%s{doc.uploaded_filename}" % LIAISON_ATTACH_URL, } -SERVE_MEETING_MATERIALS_LOCALLY = False - -# If you override SERVE_MEETING_MATERIALS_LOCALLY in your settings_local.conf, you will need to -# set the right value for MEETING_DOC_HREFS there as well. LOCAL_MEETING_DOC_HREFS and -# CDN_MEETING_DOC_HREFS are defined here to make that simpler. - -LOCAL_MEETING_DOC_HREFS = { - "agenda": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", - "minutes": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", - "slides": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", - "recording": "{doc.external_url}", - "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", -} - -CDN_MEETING_DOC_HREFS = { - "agenda": "https://www.ietf.org/proceedings/{meeting.number}/agenda/{doc.name}-{doc.rev}", - "minutes": "https://www.ietf.org/proceedings/{meeting.number}/minutes/{doc.name}-{doc.rev}", - "slides": "https://www.ietf.org/proceedings/{meeting.number}/slides/{doc.name}-{doc.rev}", - "recording": "{doc.external_url}", - "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", -} - -MEETING_DOC_HREFS = LOCAL_MEETING_DOC_HREFS if SERVE_MEETING_MATERIALS_LOCALLY else CDN_MEETING_DOC_HREFS - -MEETING_DOC_OLD_HREFS = { - "agenda": "/meeting/{meeting.number}/materials/{doc.name}", - "minutes": "/meeting/{meeting.number}/materials/{doc.name}", - "slides": "/meeting/{meeting.number}/materials/{doc.name}", - "recording": "{doc.external_url}", - "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", -} - -# For http references to documents without a version number (that is, to the current version at the time of reference) -MEETING_DOC_GREFS = { - "agenda": "/meeting/{meeting.number}/materials/{doc.name}", - "minutes": "/meeting/{meeting.number}/materials/{doc.name}", - "slides": "/meeting/{meeting.number}/materials/{doc.name}", - "recording": "{doc.external_url}", - "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", -} - - # Valid MIME types for cases where text is uploaded and immediately extracted, # e.g. a charter or a review. Must be a tuple, not a list. DOC_TEXT_FILE_VALID_UPLOAD_MIME_TYPES = ('text/plain', 'text/markdown', 'text/x-rst') @@ -893,6 +851,47 @@ XML_LIBRARY = "/www/tools.ietf.org/tools/xml2rfc/web/public/rfc/" # === Meeting Related Settings ================================================= +MEETING_MATERIALS_SERVE_LOCALLY = False + +# If you override MEETING_MATERIALS_SERVE_LOCALLY in your settings_local.conf, you will need to +# set the right value for MEETING_DOC_HREFS there as well. MEETING_DOC_LOCAL_HREFS and +# CDN_MEETING_DOC_HREFS are defined here to make that simpler. + +MEETING_DOC_LOCAL_HREFS = { + "agenda": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", + "minutes": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", + "slides": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}", + "recording": "{doc.external_url}", + "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", +} + +MEETING_DOC_CDN_HREFS = { + "agenda": "https://www.ietf.org/proceedings/{meeting.number}/agenda/{doc.name}-{doc.rev}", + "minutes": "https://www.ietf.org/proceedings/{meeting.number}/minutes/{doc.name}-{doc.rev}", + "slides": "https://www.ietf.org/proceedings/{meeting.number}/slides/{doc.name}-{doc.rev}", + "recording": "{doc.external_url}", + "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", +} + +MEETING_DOC_HREFS = MEETING_DOC_LOCAL_HREFS if MEETING_MATERIALS_SERVE_LOCALLY else MEETING_DOC_CDN_HREFS + +MEETING_DOC_OLD_HREFS = { + "agenda": "/meeting/{meeting.number}/materials/{doc.name}", + "minutes": "/meeting/{meeting.number}/materials/{doc.name}", + "slides": "/meeting/{meeting.number}/materials/{doc.name}", + "recording": "{doc.external_url}", + "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", +} + +# For http references to documents without a version number (that is, to the current version at the time of reference) +MEETING_DOC_GREFS = { + "agenda": "/meeting/{meeting.number}/materials/{doc.name}", + "minutes": "/meeting/{meeting.number}/materials/{doc.name}", + "slides": "/meeting/{meeting.number}/materials/{doc.name}", + "recording": "{doc.external_url}", + "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}", +} + MEETING_MATERIALS_DEFAULT_SUBMISSION_START_DAYS = 90 MEETING_MATERIALS_DEFAULT_SUBMISSION_CUTOFF_DAYS = 26 MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS = 50