diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -164,7 +164,7 @@ trogglepatterns = [ # The tunnel and therion drawings files pages path('dwgfiles', dwgallfiles, name="dwgallfiles"), - path('dwgfiles/', dwgallfiles, name="dwgallfiles"), + path('dwgfiles/', dwgallfiles, name="dwgallfiles"), path('dwgdataraw/<path:path>', dwgfilesingle, name="dwgfilesingle"), # QMs pages - must precede other /caves pages? @@ -177,7 +177,7 @@ trogglepatterns = [ # This next set are all intercepted by Apache, if it is running. re_path(r'^photos/(?P<subpath>.*)$', mediapage, {'doc_root': settings.PHOTOS_ROOT}, name="mediapage"), # photo galleries re_path(r'^site_media/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # MEDIA_ROOT: CSS and JS - re_path(r'^static/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # STATIC is in MEDIA now! + re_path(r'^static/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # STATIC only used by admin pages path('javascript/<path:subpath>', mediapage, {'doc_root': settings.JSLIB_ROOT}, name="mediapage"), # JSLIB_URL re_path(r'^expowebcache/3d/(?P<subpath>.*)$', mediapage, {'doc_root': settings.THREEDCACHEDIR}, name="mediapage"), @@ -201,7 +201,7 @@ urlpatterns = [ # NEW apache configurations suggested as of 2 April 2021: # Alias /site-media/ /home/expo/troggle/media/ -# Alias /robots.txt /home/expo/troggle/media/robots.txt +# Alias /robots.txt /home/expo/troggle/media/robots.txt # does not exist! # Alias /favicon.ico /home/expo/troggle/media/favicon.ico # comes from /expoweb/* when running runserver # Alias /javascript /home/expo/troggle/media/jslib # empty @@ -209,11 +209,11 @@ urlpatterns = [ # Alias /expofiles /home/expo/expofiles # Alias /photos /home/expo/webphotos # Alias /map /home/expo/expoweb/map -# Alias /javascript /usr/share/javascript # to be changed -# Alias /robots.txt /home/expo/static/robots.txt # to be changed -# Alias /favicon.ico /home/expo/static/favicon.ico # to be changed -# Alias /static/ /home/expo/static/ +# Alias /javascript /usr/share/javascript # to be changed, see above +# Alias /robots.txt /home/expo/static/robots.txt # to be changed, see above +# Alias /favicon.ico /home/expo/static/favicon.ico # to be deleted. favicon.ico now in expoweb/ +# Alias /static/ /home/expo/static/ # only used by Django admin, tinymce -# ScriptAlias /repositories /home/expo/config/apache/services/hgweb/hgweb.cgi # UPDATE thios for git +# ScriptAlias /repositories /home/expo/config/apache/services/hgweb/hgweb.cgi # UPDATE this for git # ScriptAlias /boe /home/expo/boe/boc/boc.pl # ScriptAlias /boe-lastyear /home/expo/boe/boc-previous/boc.pl |