Change db vars to standard postgres equivalents

This commit is contained in:
Devon Mackay 2018-07-30 15:50:50 -04:00 committed by dandds
parent 4b2047df0a
commit 85c8a1166d
2 changed files with 10 additions and 10 deletions

View File

@ -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)

View File

@ -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