ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hide prod DB inside docker network so only paweb can get to prod, created a new DEV DB on port 65432 and if FLASK_ENV is development you get that one

Browse Source
This commit is contained in:
Damien De Paoli
2021-06-27 13:12:42 +10:00
parent 1c2612e2cb
commit 4bda64ca17
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shared.py
View File

@@ -9,15 +9,18 @@ ICON["Import"]="fa-file-upload"
ICON["Storage"]="fa-database" ICON["Storage"]="fa-database"
ICON["Bin"]="fa-trash-alt" ICON["Bin"]="fa-trash-alt"
if hostname == PROD_HOST: if hostname == "lappy":
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":
PA_JOB_MANAGER_HOST="localhost" PA_JOB_MANAGER_HOST="localhost"
DB_URL = 'postgresql+psycopg2://pa:for_now_pa@localhost:5432/pa' DB_URL = 'postgresql+psycopg2://pa:for_now_pa@localhost:5432/pa'
else: elif os.environ['FLASK_ENV'] == "development":
PA_JOB_MANAGER_HOST="localhost" 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 PA_JOB_MANAGER_PORT=55430

2
wrapper.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
su mythtv -g mythtv -c "python3 /code/pa_job_manager.py" & 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"