CopyleftConf/copyleftconf-website Changeset - a72828efc7de

Changeset - a72828efc7de

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Brett Smith - 5 years ago 2018-10-05 19:34:47
brettcsmith@brettcsmith.org

settings: Make root for dynamic storage configurable.

1 file changed with 9 insertions and 4 deletions:

pinaxcon/settings.py

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -51,28 +51,24 @@ SITE_ID = int(os.environ.get("SITE_ID", 1)) @@
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media")
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = "/site_media/media/"
 # Absolute path to the directory static files should be collected to.
 # Don"t put anything in this directory yourself; store your static files
 # in apps" "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
 # URL prefix for static files.
@@ ... / @@ -83,24 +79,33 @@ STATIC_URL = '/static/' @@
 STATICFILES_DIRS = (
     os.path.join(PROJECT_ROOT, 'static'),
+)
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
     "compressor.finders.CompressorFinder",
+]
 try:
     _dynamic_storage_root = os.environ['DJANGO_DYNAMIC_STORAGE_ROOT']
 except KeyError:
     # Absolute filesystem path to the directory that will hold user-uploaded files.
     MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media")
 else:
     MEDIA_ROOT = os.path.join(_dynamic_storage_root, "user_upload")
     COMPRESS_ROOT = _dynamic_storage_root
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', '').strip()
 if (not SECRET_KEY) and DEBUG:
     SECRET_KEY = 'Ae=)D4\V=OFh~C63MJHgpc&6~"p-7>^2ux3#Cr;p^!RGw9.BT}U`pi|b04TDv_NB'
 TEMPLATES = [
+    {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [
             os.path.join(PACKAGE_ROOT, "templates"),
         ],
         "APP_DIRS": True,

0 comments (0 inline, 0 general)