Sfoglia il codice sorgente

Fix ENV integration

JoostSijm 6 anni fa
parent
commit
4b1bf495cb
3 ha cambiato i file con 14 aggiunte e 12 eliminazioni
  1. 1 3
      Pipfile
  2. 8 8
      app/__init__.py
  3. 5 1
      example.env

+ 1 - 3
Pipfile

@@ -12,9 +12,7 @@ flask-argon2 = "*"
 flask-migrate = "*"
 flask-sqlalchemy = "*"
 flask-apscheduler = "*"
-apscheduler = "*"
-sqlalchemy = "*"
 psycopg2-binary = "*"
-github-webhook = "*"
+python-dotenv = "*"
 
 [dev-packages]

+ 8 - 8
app/__init__.py

@@ -1,26 +1,26 @@
 
 """
-Website for Supremacy-stats
+Initialize the modules needed for the website
 """
 
+import os
+
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_login import LoginManager
 from flask_compress import Compress
 from flask_argon2 import Argon2
+from dotenv import load_dotenv
 
 
-DATABASE_URI = 'postgresql://supindex@localhost/supindex'
-
+load_dotenv()
 
 class Config(object):
-    SCHEDULER_JOBSTORES = {
-        'default': SQLAlchemyJobStore(url=DATABASE_URI)
-    }
+    """Flask configuration"""
     SCHEDULER_API_ENABLED = True
-    SQLALCHEMY_DATABASE_URI = DATABASE_URI
-    SECRET_KEY = 'g6DGM5y2bVhb0mxdCRELI5m7fnzzoJ2y'
+    SQLALCHEMY_DATABASE_URI = os.environ["DATABASE_URI"]
+    SECRET_KEY = os.environ["SECRET_KEY"]
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     SEND_FILE_MAX_AGE_DEFAULT = 1296000
 

+ 5 - 1
example.env

@@ -5,5 +5,9 @@ PIPENV_VENV_IN_PROJECT=true
 FLASK_APP=app/flaskr.py
 FLASK_DEBUG=1
 FLASK_ENV=development
-FLASK_SKIP_DOTENV=true
 TESTING=True
+
+# Own
+WEBHOOK_KEY=PLACEHOLDER
+SECRET_KEY=PLACEHOLDER
+DATABASE_URI = 'postgresql://db@localhost/db'