From 85c8a1166d918b5fe74ae65cbc3ba1b92da2870a Mon Sep 17 00:00:00 2001 From: Devon Mackay Date: Mon, 30 Jul 2018 15:50:50 -0400 Subject: [PATCH] Change db vars to standard postgres equivalents --- atst/app.py | 10 +++++----- config/base.ini | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/atst/app.py b/atst/app.py index 00162535..9ac6f55f 100644 --- a/atst/app.py +++ b/atst/app.py @@ -210,15 +210,15 @@ def make_config(): # Assemble DATABASE_URI value database_uri = ( "postgres://" - + config.get("default", "DATABASE_USERNAME") + + config.get("default", "PGUSER") + ":" - + config.get("default", "DATABASE_PASSWORD") + + config.get("default", "PGPASSWORD") + "@" - + config.get("default", "DATABASE_HOST") + + config.get("default", "PGHOST") + ":" - + config.get("default", "DATABASE_PORT") + + config.get("default", "PGPORT") + "/" - + config.get("default", "DATABASE_NAME") + + config.get("default", "PGDATABASE") ) config.set("default", "DATABASE_URI", database_uri) diff --git a/config/base.ini b/config/base.ini index 92f40d5a..6e6af123 100644 --- a/config/base.ini +++ b/config/base.ini @@ -11,8 +11,8 @@ CAC_URL = https://localhost:8001 REQUESTS_QUEUE_BASE_URL = http://localhost:8003 REDIS_URI = redis://localhost:6379 SESSION_TTL_SECONDS = 600 -DATABASE_HOST = localhost -DATABASE_PORT = 5432 -DATABASE_USERNAME = postgres -DATABASE_PASSWORD = postgres -DATABASE_NAME = atat +PGHOST = localhost +PGPORT = 5432 +PGUSER = postgres +PGPASSWORD = postgres +PGDATABASE = atat