diff --git a/.env.dist b/.env.dist index aa4af79..0910c22 100644 --- a/.env.dist +++ b/.env.dist @@ -1,2 +1,10 @@ +# Common FLASK_SECRET="" DISCORD_BOT_TOKEN="" + +# Database +DB_HOST="" +DB_PORT=3306 +DB_USER="" +DB_PASSWORD="" +DB_DBNAME="" diff --git a/.gitignore b/.gitignore index cdfd457..1dadb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ **/__pycache__ instance/ -data_persistance/secret.py **/.vscode .env diff --git a/truthseeker/logic/data_persistance/data_access.py b/truthseeker/logic/data_persistance/data_access.py index 0141532..346ee2a 100644 --- a/truthseeker/logic/data_persistance/data_access.py +++ b/truthseeker/logic/data_persistance/data_access.py @@ -1,17 +1,18 @@ +import os + from sqlalchemy import create_engine from sqlalchemy.orm import Session from sqlalchemy import engine as eg import random import truthseeker.logic.data_persistance.tables as tables -from truthseeker.logic.data_persistance.secret import HOST, USER, PASS url_object = eg.URL.create( "mariadb+pymysql", - username=USER, - password=PASS, - host=HOST, - port=6776, - database="truthInquiry", + username=os.getenv("DB_USER"), + password=os.getenv("DB_PASSWORD"), + host=os.getenv("DB_HOST"), + port=os.getenv("DB_PORT"), + database=os.getenv("DB_DBNAME"), ) engine = create_engine(url_object) session = Session(engine) diff --git a/truthseeker/logic/data_persistance/remote.py b/truthseeker/logic/data_persistance/remote.py index acf5fd4..b2a9f3f 100644 --- a/truthseeker/logic/data_persistance/remote.py +++ b/truthseeker/logic/data_persistance/remote.py @@ -1,3 +1,5 @@ +import os + from sqlalchemy import create_engine from sqlalchemy.orm import Session from sqlalchemy import engine as eg @@ -12,19 +14,17 @@ from data.questions import QUESTIONS from data.reactions import REACTIONS from data.traits import TRAITS -from secret import HOST, USER, PASS url_object = eg.URL.create( "mariadb+pymysql", - username=USER, - password=PASS, - host=HOST, - port=6776, - database="truthInquiry", + username=os.getenv("DB_USER"), + password=os.getenv("DB_PASSWORD"), + host=os.getenv("DB_HOST"), + port=os.getenv("DB_PORT"), + database=os.getenv("DB_DBNAME"), ) engine = create_engine(url_object) - # Reset data tables with Session(engine) as session: Base.metadata.drop_all(engine) diff --git a/truthseeker/logic/data_persistance/secret.py b/truthseeker/logic/data_persistance/secret.py deleted file mode 100644 index c31b0e7..0000000 --- a/truthseeker/logic/data_persistance/secret.py +++ /dev/null @@ -1,3 +0,0 @@ -HOST = "mariadb.simailadjalim.fr" -USER = "truthInquiry" -PASS = "truthInquiry" \ No newline at end of file