diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2025-01-16 23:26:27 +0000 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2025-01-16 23:28:40 +0000 |
| commit | abb32e6b5d3d125a6de87dcf1d880bc9e5e07d38 (patch) | |
| tree | 89dc79e6f9ba2e080e6697b8d4dbd44a256b9909 | |
| parent | fe9589039e293d11790c95ba48732546bf6313bc (diff) | |
| download | troggle-abb32e6b5d3d125a6de87dcf1d880bc9e5e07d38.tar.gz troggle-abb32e6b5d3d125a6de87dcf1d880bc9e5e07d38.tar.bz2 troggle-abb32e6b5d3d125a6de87dcf1d880bc9e5e07d38.zip | |
fix Path()
| -rw-r--r-- | _deploy/debian-server/localsettings-expo-live.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/_deploy/debian-server/localsettings-expo-live.py b/_deploy/debian-server/localsettings-expo-live.py index 96998cd..0ed5ff1 100644 --- a/_deploy/debian-server/localsettings-expo-live.py +++ b/_deploy/debian-server/localsettings-expo-live.py @@ -143,14 +143,15 @@ SCANS_ROOT = EXPOFILES / "surveyscans" PHOTOS_ROOT = EXPOFILES / "photos" #EXPOFILES = urllib.parse.urljoin(REPOS_ROOT_PATH, 'expofiles/') -PHOTOS_URL = urllib.parse.urljoin(URL_ROOT, '/photos/') +PHOTOS_URL = Path(URL_ROOT, "/photos/") +#PHOTOS_URL = urllib.parse.urljoin(URL_ROOT, '/photos/') # MEDIA_URL is used by urls.py in a regex. See urls.py & core/views_surveys.py MEDIA_URL = '/site_media/' -STATIC_URL = urllib.parse.urljoin(URL_ROOT , '/static/') # used by Django admin pages. Do not delete. -JSLIB_URL = urllib.parse.urljoin(URL_ROOT , '/javascript/') # always fails, try to revive it ? +STATIC_URL = Path(URL_ROOT, "/static/") # used by Django admin pages. Do not delete. +JSLIB_URL = Path(URL_ROOT, "/javascript/") # used for CaveViewer JS utility # STATIC_ROOT removed after merging content into MEDIA_ROOT. See urls.py & core/views/surveys.py #TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed |