diff --git a/docker/settings_local.py b/docker/settings_local.py index 697bff9dc..e1249908e 100644 --- a/docker/settings_local.py +++ b/docker/settings_local.py @@ -17,3 +17,11 @@ IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits" IDSUBMIT_REPOSITORY_PATH = "test/id/" IDSUBMIT_STAGING_PATH = "test/staging/" INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/" + +BASE_DIR = os.path.dirname(os.path.abspath(__file__)) + +MEDIA_ROOT = BASE_DIR + '/media/' +MEDIA_URL = '/media/' + +PHOTOS_DIRNAME = 'photos' +PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME diff --git a/ietf/doc/models.py b/ietf/doc/models.py index 4a772db77..a6a403ef5 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -389,10 +389,10 @@ class Document(DocumentInfo): else: filename = self.external_url if meeting.type_id == 'ietf': - url = '%sproceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename) + url = '%sproceedings/%s/%s/%s' % (settings.IETF_HOST_URL,meeting.number,self.type_id,filename) elif meeting.type_id == 'interim': url = "%sproceedings/interim/%s/%s/%s/%s" % ( - settings.MEDIA_URL, + settings.IETF_HOST_URL, meeting.date.strftime('%Y/%m/%d'), session.group.acronym, self.type_id, diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py index ac9c023d1..8d6b74ae9 100644 --- a/ietf/secr/proceedings/models.py +++ b/ietf/secr/proceedings/models.py @@ -52,7 +52,7 @@ class InterimMeeting(Meeting): ''' if os.path.exists(self.get_proceedings_path()): url = "%sproceedings/interim/%s/%s/proceedings.html" % ( - settings.MEDIA_URL, + settings.IETF_HOST_URL, self.date.strftime('%Y/%m/%d'), self.group().acronym) return url diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py index feabd82d5..64e71f41f 100644 --- a/ietf/secr/proceedings/proc_utils.py +++ b/ietf/secr/proceedings/proc_utils.py @@ -269,10 +269,10 @@ def create_proceedings(meeting, group, is_final=False): meeting_root = get_upload_root(meeting) if meeting.type.slug == 'ietf': - url_root = "%sproceedings/%s/" % (settings.MEDIA_URL,meeting.number) + url_root = "%sproceedings/%s/" % (settings.IETF_HOST_URL,meeting.number) else: url_root = "%sproceedings/interim/%s/%s/" % ( - settings.MEDIA_URL, + settings.IETF_HOST_URL, meeting.date.strftime('%Y/%m/%d'), group.acronym) @@ -407,7 +407,7 @@ def gen_areas(context): # append proceedings URL for group in gmet + gnot: - group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym) + group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.IETF_HOST_URL,meeting.number,group.acronym) for (counter,area) in enumerate(context['areas'], start=1): groups_met = {'wg':filter(lambda a: a.parent==area and a.state.slug not in ('bof','bof-conc') and a.type_id=='wg',gmet), @@ -584,7 +584,7 @@ def gen_research(context): # append proceedings URL for group in groups: - group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym) + group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.IETF_HOST_URL,meeting.number,group.acronym) html = render_to_response('proceedings/rg_irtf.html',{ 'meeting': meeting, diff --git a/ietf/secr/utils/meeting.py b/ietf/secr/utils/meeting.py index 6873e7028..63fd9765b 100644 --- a/ietf/secr/utils/meeting.py +++ b/ietf/secr/utils/meeting.py @@ -36,13 +36,13 @@ def get_proceedings_path(meeting,group): def get_proceedings_url(meeting,group=None): if meeting.type_id == 'ietf': - url = "%sproceedings/%s/" % (settings.MEDIA_URL,meeting.number) + url = "%sproceedings/%s/" % (settings.IETF_HOST_URL,meeting.number) if group: url = url + "%s.html" % group.acronym elif meeting.type_id == 'interim': url = "%sproceedings/interim/%s/%s/proceedings.html" % ( - settings.MEDIA_URL, + settings.IETF_HOST_URL, meeting.date.strftime('%Y/%m/%d'), group.acronym) return url diff --git a/ietf/settings.py b/ietf/settings.py index 942cfc3e3..a5d8ec694 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -100,12 +100,15 @@ USE_I18N = False USE_TZ = False -MEDIA_URL = 'https://www.ietf.org/' -IETF_ID_URL = MEDIA_URL + 'id/' -IETF_ID_ARCHIVE_URL = MEDIA_URL + 'archive/id/' +MEDIA_ROOT = '/a/www/www6s/lib/dt/media/' +MEDIA_URL = 'https://www.ietf.org/lib/dt/media/' +PHOTOS_DIRNAME = 'photo' +PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME + +IETF_HOST_URL = 'https://www.ietf.org/' +IETF_ID_URL = IETF_HOST_URL + 'id/' +IETF_ID_ARCHIVE_URL = IETF_HOST_URL + 'archive/id/' -PHOTOS_DIR = '/a/www/www6/' -PHOTO_URL_PREFIX = 'photos/' # Absolute path to the directory static files should be collected to. # Example: "/var/www/example.com/static/" diff --git a/ietf/urls.py b/ietf/urls.py index d70c5935c..8a82a25e7 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -2,6 +2,7 @@ from django.conf import settings from django.conf.urls import patterns, include +from django.conf.urls.static import static from django.contrib import admin from django.views.generic import TemplateView from django.contrib.staticfiles.urls import staticfiles_urlpatterns @@ -82,15 +83,11 @@ if settings.SERVER_MODE in ('development', 'test'): ## maybe preserve some static legacy URLs ? (r'^(?P(?:images|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT+'ietf/'}), ) + + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) ) -# This is needed to serve files which are not handled by collectstatic : -# if settings.SERVER_MODE in ('development', 'test'): -# urlpatterns += patterns('', -# (r'^(?P(?:images|css|js|test|static)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}), -# (r'^(?Padmin/(?:img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}), -# (r'^(?Psecretariat/(img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL}), -# (r'^(?Probots\.txt)$', 'django.views.static.serve', {'document_root': settings.STATIC_LOCAL+"dev/"}), -# (r'^_test500/$', lambda x: None), -# (r'^environment/$', 'ietf.help.views.environment'), -# ) +import debug +debug.debug = True +debug.show('static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)') + +