diff --git a/cef_3M/sql.py b/cef_3M/sql.py index 194e2c5..ef9e434 100644 --- a/cef_3M/sql.py +++ b/cef_3M/sql.py @@ -1,11 +1,17 @@ from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker + +import config from .sql_generated import * import configparser alembic = configparser.ConfigParser() alembic.read("alembic.ini") +try: + dburl = alembic.get("alembic", "sqlalchemy.url") +except: + dburl = config.DBURL engine = create_engine( alembic.get("alembic", "sqlalchemy.url"), diff --git a/config.example.py b/config.example.py index 70618ee..4009b7c 100644 --- a/config.example.py +++ b/config.example.py @@ -1,14 +1,15 @@ import os -SECRETKEY = os.path.join("keys", "pubkey.pem") +SECRETKEY = os.path.join("keys", "3m.pem") # CEF-specific port (grumble communicates over it as well) -ERGO_ADDR = "127.0.0.1" -ERGO_PORT = 22843 +ERGO_ADDR = os.getenv("THREEM_ERGO_ADDR") or "127.0.0.1" +ERGO_PORT = os.getenv("THREEM_ERGO_PORT") or 22843 -MINIO_INTERNAL_ADDR = "http://127.0.0.1:9000" # dodges nginx -MINIO_EXTERNAL_ADDR = "data.example.xyz" -MINIO_ACCESS_KEY = "access-key-goes-here" -MINIO_SECRET_KEY = "secret-key-goes-here" +MINIO_INTERNAL_ADDR = os.getenv("THREEM_MINIO_INTERNAL_ADDR") or "http://127.0.0.1:9000" # dodges nginx +MINIO_EXTERNAL_ADDR = os.getenv("THREEM_MINIO_EXTERNAL_ADDR") or "data.example.xyz" +MINIO_ACCESS_KEY = os.getenv("THREEM_MINIO_ACCESS_KEY") or "access-key-goes-here" +MINIO_SECRET_KEY = os.getenv("THREEM_MINIO_SECRET_KEY") or "secret-key-goes-here" +DBURL = os.getenv("THREEM_DBURL") or "mysql+mysqldb://ergo:password@localhost/ergo_ext" MAX_FILE_SIZE = 1024*1024*20 MAX_PFP_SIZE = 1024*1024*1.5