From c2ccb01aabf777f904e9afc83ad2ab34e29885ef Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Wed, 13 Jan 2021 23:47:32 -0800 Subject: [PATCH] add DATABASE_HOST config parameter --- app/scripts/delete_photo.py | 2 +- app/scripts/get_photo_list.py | 4 ++-- app/scripts/process_uploaded_photo.py | 2 +- app/scripts/set_contributor_id_seq.py | 2 +- app/scripts/totp_utils.py | 6 +++--- config.py | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/scripts/delete_photo.py b/app/scripts/delete_photo.py index 8c59dfb..7885adb 100644 --- a/app/scripts/delete_photo.py +++ b/app/scripts/delete_photo.py @@ -8,7 +8,7 @@ def delete_photo(photo, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor() diff --git a/app/scripts/get_photo_list.py b/app/scripts/get_photo_list.py index 082c0c7..c2cfeda 100644 --- a/app/scripts/get_photo_list.py +++ b/app/scripts/get_photo_list.py @@ -9,7 +9,7 @@ def find_next_previous(photo, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor() @@ -59,7 +59,7 @@ def get_photo_list(contributor_id, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) diff --git a/app/scripts/process_uploaded_photo.py b/app/scripts/process_uploaded_photo.py index 5f633d3..079c82d 100644 --- a/app/scripts/process_uploaded_photo.py +++ b/app/scripts/process_uploaded_photo.py @@ -13,7 +13,7 @@ def process_uploaded_photo(filename, current_user, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor() diff --git a/app/scripts/set_contributor_id_seq.py b/app/scripts/set_contributor_id_seq.py index 6edd53d..e313127 100644 --- a/app/scripts/set_contributor_id_seq.py +++ b/app/scripts/set_contributor_id_seq.py @@ -7,7 +7,7 @@ def set_contributor_id_seq(app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) diff --git a/app/scripts/totp_utils.py b/app/scripts/totp_utils.py index 19b361f..5c4efd7 100644 --- a/app/scripts/totp_utils.py +++ b/app/scripts/totp_utils.py @@ -13,7 +13,7 @@ def get_totp_qr(contributor, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor() @@ -33,7 +33,7 @@ def validate_totp(contributor, totp_code, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor() @@ -49,7 +49,7 @@ def disable_2fa(contributor, app_config): conn = psycopg2.connect( dbname=app_config['DATABASE_NAME'], user=app_config['DATABASE_USER'], - host="/var/run/postgresql", + host=app_config['DATABASE_HOST'], password=app_config['DATABASE_PASSWORD'] ) cur = conn.cursor() diff --git a/config.py b/config.py index 2dae490..26ced16 100644 --- a/config.py +++ b/config.py @@ -14,6 +14,7 @@ class Config(object): SQLALCHEMY_TRACK_MODIFICATIONS = False DATABASE_NAME = os.environ.get('DATABASE_NAME') DATABASE_USER = os.environ.get('DATABASE_USER') + DATABASE_HOST = os.environ.get('DATABASE_HOST') DATABASE_PASSWORD = os.environ.get('DATABASE_PASSWORD') LOGGING_XMPP_SERVER = os.environ.get('LOGGING_XMPP_SERVER')