Skip to content

Commit

Permalink
Mount pg service in filebrowser and touch it when starting db or qgis
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Sutton committed Dec 25, 2021
1 parent 813fb9b commit 94f520d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ enable-qgis-server:
-@cd conf/nginx_conf/locations; ln -s qgis-server.conf.available qgis-server.conf
-@cd conf/nginx_conf/upstreams; ln -s qgis-server.conf.available qgis-server.conf
@echo "qgis-server" >> enabled-profiles
@touch conf/pg_conf/pg_service.conf

restart-qgis-server: ## Stop and restart the QGIS server containers
@make check-env
Expand All @@ -447,6 +448,7 @@ restart-qgis-server: ## Stop and restart the QGIS server containers
@echo "Restarting QGIS Server containers"
@echo "------------------------------------------------------------------"
# Need to flush this completely for it to work on restart
@touch conf/pg_conf/pg_service.conf
make stop-qgis-desktop
make start-qgis-desktop

Expand Down Expand Up @@ -687,6 +689,7 @@ configure-postgres: configure-timezone
@echo
@read -p "Postgis Public Port (e.g. 5432):" PORT; \
rpl POSTGRES_PUBLIC_PORT=5432 POSTGRES_PUBLIC_PORT=$$PORT .env;
@touch conf/pg_conf/pg_service.conf

start-postgres:
@make check-env
Expand Down Expand Up @@ -1249,6 +1252,8 @@ enable-postgrest:
-@cd conf/nginx_conf/locations; ln -s swagger.conf.available swagger.conf
-@cd conf/nginx_conf/upstreams; ln -s postgrest.conf.available postgrest.conf
-@cd conf/nginx_conf/upstreams; ln -s swagger.conf.available swagger.conf
#
-@cp mv conf/swagger_conf/swagger.json.example conf/swagger_conf/swagger.json
@echo "postgrest" >> enabled-profiles

configure-postgrest: start-postgrest
Expand Down
File renamed without changes.
7 changes: 5 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,11 @@ services:
- ./conf/mapproxy_conf/seed.yaml:/files/mapproxy/seed.yaml
- ./conf/mapproxy_conf/mapproxy.yaml:/files/mapproxy/mapproxy.yaml
- ./conf/mapproxy_conf/clip:/files/mapproxy/clip
# Nore red data
- node-red-data:/files/node_red__data
# Node red data
- node-red-data:/files/node_red_data
# PG Service file - take care of permissions to not expose passwords to
# all file browser users!
- ./conf/pg_conf/:/files/pg_conf
user: 1000:1000
networks:
- os-gis-stack
Expand Down

0 comments on commit 94f520d

Please sign in to comment.