# HG changeset patch # User souliane # Date 1433884701 -7200 # Node ID 6652924221ba6ecc2552f1160eaa8f3c2ff5412f # Parent 6250b65523c6b8990bcf9090c3caef394872b412 change external base URLs from FTP to HTTP diff -r 6250b65523c6 -r 6652924221ba sat_website/local_settings.py --- a/sat_website/local_settings.py Tue Jun 09 15:19:50 2015 +0200 +++ b/sat_website/local_settings.py Tue Jun 09 23:18:21 2015 +0200 @@ -107,10 +107,10 @@ # Options for SàT website (see README) # External URL pointing the external media files -MEDIA_EXTERNAL_URL = 'ftp://ftp.goffi.org/media' +MEDIA_EXTERNAL_URL = 'http://ftp.goffi.org/media' # External URL pointing the projects archives directory -PROJECTS_EXTERNAL_URL = 'ftp://ftp.goffi.org' +PROJECTS_EXTERNAL_URL = 'http://ftp.goffi.org' # Internal path to the the projects archives directory PROJECTS_INTERNAL_PATH = '/srv/ftp' diff -r 6250b65523c6 -r 6652924221ba sat_website/screenshots.py --- a/sat_website/screenshots.py Tue Jun 09 15:19:50 2015 +0200 +++ b/sat_website/screenshots.py Tue Jun 09 23:18:21 2015 +0200 @@ -27,8 +27,7 @@ ImageDesc = namedtuple("ImageDesc", "path description data") VideoDesc = namedtuple("VideoDesc", "path description poster data") -media_path = os.path.normpath(settings.MEDIA_EXTERNAL_URL) -screencasts = os.path.join(media_path, "screencasts") + "/" +screencasts = os.path.join(settings.MEDIA_EXTERNAL_URL, "screencasts") + "/" #list the pictures