diff --git a/shared.py b/shared.py index 69324d0..d7f065d 100644 --- a/shared.py +++ b/shared.py @@ -9,15 +9,18 @@ ICON["Import"]="fa-file-upload" ICON["Storage"]="fa-database" ICON["Bin"]="fa-trash-alt" -if hostname == PROD_HOST: - PA_JOB_MANAGER_HOST="192.168.0.2" - DB_URL = 'postgresql+psycopg2://pa:for_now_pa@192.168.0.2:55432/pa' -elif hostname == "lappy": +if hostname == "lappy": PA_JOB_MANAGER_HOST="localhost" DB_URL = 'postgresql+psycopg2://pa:for_now_pa@localhost:5432/pa' -else: +elif os.environ['FLASK_ENV'] == "development": PA_JOB_MANAGER_HOST="localhost" - DB_URL = 'postgresql+psycopg2://pa:for_now_pa@mara.ddp.net:55432/pa' + DB_URL = 'postgresql+psycopg2://pa:for_now_pa@mara.ddp.net:65432/pa' +elif os.environ['FLASK_ENV'] == "production": + PA_JOB_MANAGER_HOST="192.168.0.2" + DB_URL = 'postgresql+psycopg2://pa:for_now_pa@padb/pa' +else: + print( "ERROR: I do not know which environment (development, etc.) and which DB (on which host to use)" ) + exit( -1 ) PA_JOB_MANAGER_PORT=55430 diff --git a/wrapper.sh b/wrapper.sh index 126def4..bd19ce3 100755 --- a/wrapper.sh +++ b/wrapper.sh @@ -1,4 +1,4 @@ #!/bin/bash su mythtv -g mythtv -c "python3 /code/pa_job_manager.py" & -gunicorn --bind=0.0.0.0:443 --workers=4 --threads=16 --certfile /etc/letsencrypt/live/pa.depaoli.id.au/fullchain.pem --keyfile /etc/letsencrypt/live/pa.depaoli.id.au/privkey.pem main:app --preload +gunicorn --bind=0.0.0.0:443 --workers=4 --threads=16 --certfile /etc/letsencrypt/live/pa.depaoli.id.au/fullchain.pem --keyfile /etc/letsencrypt/live/pa.depaoli.id.au/privkey.pem main:app --env FLASK_ENV="production"