arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'redacting'

Browse Source 
# Conflicts:
#	PyRIGS/settings.py
#	db.sqlite3
This commit is contained in:
Tom Price
2015-11-10 10:32:05 +00:00
parent adf9b8ba75 9d39e2cdf2
commit 887e932c64
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PyRIGS/settings.py
View File

@@ -139,21 +139,21 @@ LOGOUT_URL = '/user/logout'
ACCOUNT_ACTIVATION_DAYS = 7 ACCOUNT_ACTIVATION_DAYS = 7
# reCAPTCHA settings # reCAPTCHA settings
RECAPTCHA_PUBLIC_KEY = '6Le16gUTAAAAAO5f-6te_x0NjWmF65_h7saBI6Cg' RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None)
RECAPTCHA_PRIVATE_KEY = '6Le16gUTAAAAAByo-ZxRRX3RKyoBngf7ms3dnoEW' RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', None)
NOCAPTCHA = True NOCAPTCHA = True
# Email # Email
EMAILER_TEST = False EMAILER_TEST = False
if not DEBUG or EMAILER_TEST: if not DEBUG or EMAILER_TEST:
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'mail.nottinghamtec.co.uk' EMAIL_HOST = os.environ.get('EMAIL_HOST')
EMAIL_PORT = 465 EMAIL_PORT = int(os.environ.get('EMAIL_PORT'))
EMAIL_HOST_USER = 'pyrigs@nottinghamtec.co.uk' EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
EMAIL_HOST_PASSWORD = 'N_dF9T&dD(Th' EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
EMAIL_USE_TLS = False EMAIL_USE_TLS = bool(int(os.environ.get('EMAIL_USE_TLS', 0)))
EMAIL_USE_SSL = True EMAIL_USE_SSL = bool(int(os.environ.get('EMAIL_USE_SSL', 0)))
DEFAULT_FROM_EMAIL = 'pyrigs@nottinghamtec.co.uk' DEFAULT_FROM_EMAIL = os.environ.get('EMAIL_FROM')
else: else:
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

BIN
db.sqlite3
View File

Binary file not shown.