From e4676d908e47dce994fac1aa8faa825a53919b2f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 6 Jan 2020 22:53:59 +0100 Subject: [PATCH] changes --- app.py | 10 ---------- rowers/views/statements.py | 5 +++-- rowsandall_app/settings.py | 10 ++++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 app.py diff --git a/app.py b/app.py deleted file mode 100644 index 8d4b6fe1..00000000 --- a/app.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/srv/bin/venv python3.6 -import os -import sys - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "rowsandall_app.settings") - -from django.core.wsgi import get_wsgi_application -application = get_wsgi_application() - -#execute_from_command_line(sys.argv) diff --git a/rowers/views/statements.py b/rowers/views/statements.py index f2b3a263..9f09bccc 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -158,7 +158,8 @@ from rowsandall_app.settings import ( RUNKEEPER_CLIENT_ID,RUNKEEPER_REDIRECT_URI,RUNKEEPER_CLIENT_SECRET, TP_CLIENT_ID,TP_REDIRECT_URI,TP_CLIENT_KEY,TP_CLIENT_SECRET, BRAINTREE_MERCHANT_ID,BRAINTREE_PUBLIC_KEY,BRAINTREE_PRIVATE_KEY, - PAYMENT_PROCESSING_ON + PAYMENT_PROCESSING_ON, + RECAPTCHA_SITE_KEY, RECAPTCHA_SITE_SECRET ) #from rowers.tasks_standalone import addcomment2 @@ -1080,7 +1081,7 @@ def sendmail(request): # test recaptcha response_string = request.POST.get('g-recaptcha-response') # replace below with settings - recaptcha_secret = '6LdRtMwUAAAAABc3piLDlI5VNDkOtEMIOckNi9tm' + recaptcha_secret = RECAPTCHA_SITE_SECRET url = 'https://www.google.com/recaptcha/api/siteverify' data = { 'secret':recaptcha_secret, diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 2df72fc8..283aa476 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -494,3 +494,13 @@ try: CELERY = CFG['use_celery'] except KeyError: CELERY = False + + +# Recaptcha + +try: + RECAPTCHA_SITE_KEY = CFG['recaptcha_site_key'] + RECAPTCHA_SITE_SECRET = CFG['recaptcha_site_secret'] +except KeyError: + RECAPTCHA_SITE_KEY = '' + RECAPTCHA_SITE_SECRET = ''