From 4ac5becb02e5509a655c791807e6d8a9a9a20561 Mon Sep 17 00:00:00 2001 From: Egor Svitin Date: Tue, 7 Feb 2023 12:19:06 +0300 Subject: [PATCH 1/2] update build env --- .env.sample | 2 ++ build/build.xml | 2 ++ configs/config.py | 2 ++ configs/configs.py | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 986cec6..5adb97b 100644 --- a/.env.sample +++ b/.env.sample @@ -1,5 +1,7 @@ DB_NAME="@lcDbName@" DB_HOST="@lcDbHost@" +DB_USERNAME="@lcDbUsername@" +DB_PASSWORD="@lcDbPassword@" API_URL="@lcApiUrl@" API_KEY="@lcApiKey@" diff --git a/build/build.xml b/build/build.xml index 068ffbe..e2d3d72 100644 --- a/build/build.xml +++ b/build/build.xml @@ -12,6 +12,8 @@ description="Replace placeholders in config files" > + + diff --git a/configs/config.py b/configs/config.py index 62688b8..6417a05 100644 --- a/configs/config.py +++ b/configs/config.py @@ -12,6 +12,8 @@ class AppConfig: self.refresh() connect( db=CONFIGS['db']['name'], + username=CONFIGS['db']['username'], + password=CONFIGS['db']['password'] host="mongodb://{host}:27017/{database}".format(host=CONFIGS['db']['host'], database=CONFIGS['db']['name']) ) diff --git a/configs/configs.py b/configs/configs.py index 7983a96..3765b12 100644 --- a/configs/configs.py +++ b/configs/configs.py @@ -3,7 +3,9 @@ import os CONFIGS = { 'db' : { 'name' : os.environ['DB_NAME'], - 'host' : os.environ['DB_HOST'] + 'host' : os.environ['DB_HOST'], + 'username' : os.environ['DB_USERNAME'], + 'password' : os.environ['DB_PASSWORD'] }, 'application_credentials' : { 'api_url' : os.environ['API_URL'], From 26f8e2dcbb9dd86859699ca4e0aa8afdf86d13cf Mon Sep 17 00:00:00 2001 From: Egor Svitin Date: Tue, 7 Feb 2023 12:22:12 +0300 Subject: [PATCH 2/2] update configs --- configs/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/config.py b/configs/config.py index 6417a05..c023820 100644 --- a/configs/config.py +++ b/configs/config.py @@ -12,8 +12,8 @@ class AppConfig: self.refresh() connect( db=CONFIGS['db']['name'], - username=CONFIGS['db']['username'], - password=CONFIGS['db']['password'] + username=CONFIGS['db']['username'], + password=CONFIGS['db']['password'] host="mongodb://{host}:27017/{database}".format(host=CONFIGS['db']['host'], database=CONFIGS['db']['name']) )