Merge pull request #2 from danceb/main

Cleaning ENV and exporting them for the use with crontab

Author: manisandro

Dockerfile

@@ -20,9 +20,8 @@ ENV SLEEP_INTERVAL=1
 # The default URL of the QGIS server to send requests to
 ENV DEFAULT_QGIS_SERVER_URL="http://qwc-qgis-server/ows/"
 
-# Connection URL for configuration database to read QGIS project files
+# Postgres service configuration file including a [qgisprojects] service to read QGIS project files from database.
 ENV PGSERVICEFILE="/srv/pg_service.conf"
-ENV CONFIG_DB_URL="postgresql:///?service=qgisprojects"
 # The name of the DB schema which stores the project files in a table 'qgis_projects'.
 ENV PG_DB_SCHEMA="qwc_config"
 

entrypoint.sh

@@ -24,6 +24,7 @@ export QGS_EXT=${QGS_EXT}
 export FCGI_INSTANCES=${FCGI_INSTANCES}
 export SLEEP_INTERVAL=${SLEEP_INTERVAL}
 export DEFAULT_QGIS_SERVER_URL=${DEFAULT_QGIS_SERVER_URL}
+export PGSERVICEFILE=${PGSERVICEFILE}
 export PG_DB_SCHEMA=${PG_DB_SCHEMA}
 EOF
 echo "$CRON_SCHEDULE . $HOME/.cron_env; /app/qgs_cache_preseed.sh >/proc/1/fd/1 2>/proc/1/fd/2" | crontab -