diff --git a/.gitignore b/.gitignore index 9a3a0b4a..f1124eec 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ logs Thumbs.db # Folder config file -Desktop.ini \ No newline at end of file +Desktop.ini +/database/.env diff --git a/database/create_database_ubuntu.sh b/database/create_database_ubuntu.sh index 48e19429..31e43ee6 100644 --- a/database/create_database_ubuntu.sh +++ b/database/create_database_ubuntu.sh @@ -1,6 +1,8 @@ #!/bin/sh -mypassword="pAssw0rd@12345" +e_mypassword="U2FsdGVkX1+VZdIDGQqLkpIvF47w7nq+UyZAetppy2k=" + +mypassword=`echo $e_mypassword |openssl enc -aes-256-cbc -md sha512 -a -d -pbkdf2 -iter 100000 -salt -pass pass:$mypass` mysql -uroot -p$mypassword < myems_billing_baseline_db.sql mysql -uroot -p$mypassword < myems_billing_db.sql diff --git a/myems-api/.gitignore b/myems-api/.gitignore index 83d71500..797f69bb 100644 --- a/myems-api/.gitignore +++ b/myems-api/.gitignore @@ -50,3 +50,4 @@ doc/_build *~ advancereport/ +/.env diff --git a/myems-api/config.py b/myems-api/config.py index c8567c6f..a9a7f317 100644 --- a/myems-api/config.py +++ b/myems-api/config.py @@ -1,62 +1,68 @@ +from decouple import config + + +userID = config('userID', default='root') +password = config('password', default='') + myems_system_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_system_db', } myems_energy_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_energy_db', } myems_energy_baseline_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_energy_baseline_db', } myems_billing_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_billing_db', } myems_billing_baseline_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_billing_baseline_db', } myems_historical_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_historical_db', } myems_user_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_user_db', } myems_fdd_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_fdd_db', } myems_reporting_db = { - 'user': 'root', - 'password': 'pAssw0rd@12345', + 'user': userID, + 'password': password, 'host': '127.0.0.1', 'database': 'myems_reporting_db', } diff --git a/myems-api/requirements.txt b/myems-api/requirements.txt index 756cb6e6..cbcd0069 100644 --- a/myems-api/requirements.txt +++ b/myems-api/requirements.txt @@ -9,4 +9,5 @@ gunicorn et_xmlfile==1.1 jdcal openpyxl==3.0.7 -pillow \ No newline at end of file +pillow +python-decouple \ No newline at end of file