Merge branch 'release/1.0.9'
This commit is contained in:
commit
76862449c5
@ -31,6 +31,7 @@ ANYMAIL_CONFIG = {
|
||||
SERVER_EMAIL = os.environ.get('SERVER_EMAIL', '')
|
||||
DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL', '')
|
||||
DEFAULT_CONTACT_EMAIL = os.environ.get('DEFAULT_CONTACT_EMAIL', '')
|
||||
STATIC_ROOT_PATH = os.environ.get('STATIC_ROOT_PATH', '/var/www/ptcoffee-dev/static/')
|
||||
|
||||
SECURE_HSTS_SECONDS = os.environ.get('SECURE_HSTS_SECONDS', 3600)
|
||||
SECURE_SSL_REDIRECT = os.environ.get('SECURE_SSL_REDIRECT', 'False') == 'True'
|
||||
|
||||
@ -155,7 +155,7 @@ STATIC_URL = '/static/'
|
||||
if DEBUG:
|
||||
STATIC_ROOT = BASE_DIR / 'public'
|
||||
else:
|
||||
STATIC_ROOT = '/var/www/ptcoffee-dev/static/'
|
||||
STATIC_ROOT = STATIC_ROOT_PATH
|
||||
STATICFILES_DIRS = [BASE_DIR / 'static']
|
||||
MEDIA_URL = '/media/'
|
||||
MEDIA_ROOT = BASE_DIR / 'media'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user