sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-25 18:32:39 +01:00
parent adc74360cb 8b46d8a1e4
commit 65ccd8b0cb
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowsandall_app/settings.py
View File

@@ -133,7 +133,7 @@ TEMPLATES = [
# 'django.template.loaders.app_directories.Loader', # 'django.template.loaders.app_directories.Loader',
# ], # ],
}, },
}, },
] ]
@@ -205,8 +205,8 @@ TIME_ZONE = 'UTC'
TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT') TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')
LOCALE_PATHS = ( LOCALE_PATHS = (
os.path.join(BASE_DIR, 'locale'), os.path.join(BASE_DIR, 'locale'),
# os.path.join(BASE_DIR, 'cvkbrno/locale'), # os.path.join(BASE_DIR, 'cvkbrno/locale'),
) )
LANGUAGES = ( LANGUAGES = (
@@ -221,11 +221,11 @@ LANGUAGE_COOKIE_NAME = 'wm_lang'
# https://docs.djangoproject.com/en/1.9/howto/static-files/ # https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = BASE_DIR #STATIC_ROOT = BASE_DIR
#STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static/plots'),]
os.path.join(BASE_DIR, 'static/plots'),] # os.path.join(BASE_DIR, 'static'),
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
@@ -452,7 +452,7 @@ try:
BRAINTREE_MERCHANT_ACCOUNT_ID = CFG['braintree_merchant_account_id'] BRAINTREE_MERCHANT_ACCOUNT_ID = CFG['braintree_merchant_account_id']
except KeyError: except KeyError:
BRAINTREE_MERCHANT_ACCOUNT_ID = 'rowsandallEUR' BRAINTREE_MERCHANT_ACCOUNT_ID = 'rowsandallEUR'
try: try:
BRAINTREE_PUBLIC_KEY = CFG['braintree_public_key'] BRAINTREE_PUBLIC_KEY = CFG['braintree_public_key']
except KeyError: except KeyError:

10
rowsandall_app/settings_dev.py
View File

@@ -20,7 +20,7 @@ except KeyError:
if 'test' in sys.argv: if 'test' in sys.argv:
TESTING = True TESTING = True
if TESTING or use_sqlite: if TESTING or use_sqlite:
DATABASES = { DATABASES = {
'default': { 'default': {
@@ -33,7 +33,7 @@ if TESTING or use_sqlite:
# 'CHARSET': 'utf8', # 'CHARSET': 'utf8',
# 'COLLATION': 'utf8_general_ci', # 'COLLATION': 'utf8_general_ci',
# }, # },
# 'slave': { # 'slave': {
# 'ENGINE': 'django.db.backends.mysql', # 'ENGINE': 'django.db.backends.mysql',
# 'NAME': 'rowsanda_107501', # 'NAME': 'rowsanda_107501',
@@ -41,8 +41,8 @@ if TESTING or use_sqlite:
# } # }
} }
BROKER_URL = 'redis://localhost:6379/0' BROKER_URL = 'redis://localhost:6379/0'
CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
CELERY_IGNORE_RESULT = False CELERY_IGNORE_RESULT = False
@@ -78,6 +78,7 @@ CACHES = {
STATIC_URL = '/static/' STATIC_URL = '/static/'
#STATIC_ROOT = 'C:/python/rowsandallapp' #STATIC_ROOT = 'C:/python/rowsandallapp'
STATIC_ROOT = BASE_DIR
INTERNAL_IPS = ['127.0.0.1'] INTERNAL_IPS = ['127.0.0.1']
@@ -108,4 +109,3 @@ EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com' DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SETTINGS_NAME = 'rowsandall_app.settings_dev' SETTINGS_NAME = 'rowsandall_app.settings_dev'