Be able to configure the PGSCHEMA in mapserver

doc/integrator/database.rst

@@ -26,16 +26,19 @@ integration and production => ``main_2018``
 
 The schema ``main_2017`` still exists to be able to rollback the production.
 
-To do that we should manage the ``PGSCHEMA`` and the ``PGSCHEMA_STATIC`` variable in your makefiles.
+To do that we should manage the ``PGSCHEMA`` and the ``DOCKER_PGSCHEMA_STATIC`` variable in your
+makefiles.
 
-The ``PGSCHEMA`` should be set in the ``Makefile`` and the ``PGSCHEMA_STATIC`` for the production should be
-set in a specific makefile for the production e.-g. ``production.mk``.
+The ``PGSCHEMA`` should be set in the ``Makefile`` and the ``DOCKER_PGSCHEMA_STATIC`` for the
+production should be set in a specific makefile for the production e.-g. ``production.mk``.
 
-To to the schema we provide a Postgres function, to create it:
+And the line `PGSCHEMA=${docker_schema}` should be removed from your `.env.mako` file.
+
+To copy the schema, we provide a Postgres function, to create it use:
 
 .. prompt:: bash
 
-   sudo -u postgres psql <database> --file=scripts/CONST_clone_schema.sql
+   docker-compose exec geoporal psql <database> --file=scripts/CONST_clone_schema.sql
 
 To use it:
 

geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako

@@ -1,5 +1,8 @@
 FROM camptocamp/geomapfish-config-build:${geomapfish_version}
 
+ARG PGSCHEMA
+ENV PGSCHEMA=$PGSCHEMA
+
 COPY . /tmp/config/
 
 RUN mv /tmp/config/bin/* /usr/bin/ && \

geoportal/c2cgeoportal_geoportal/scaffolds/create/bin/eval-templates

@@ -6,9 +6,31 @@ import re
 import urllib.parse
 import subprocess
 
+os.environ["DOLLAR"] = '$'
 os.environ["VISIBLE_WEB_HOST_RE_ESCAPED"] = re.escape(os.environ.get('VISIBLE_WEB_HOST'))
 os.environ["VISIBLE_ENTRY_POINT_RE_ESCAPED"] = re.escape(os.environ.get('VISIBLE_ENTRY_POINT'))
-os.environ["DOLLAR"] = '$'
+os.environ["MAPSERVER_DATA_SUBSELECT"] = (
+    "SELECT ST_Collect(ra.area) "
+    "FROM {PGSCHEMA}.restrictionarea AS ra, {PGSCHEMA}.role_restrictionarea AS rra, "
+    "{PGSCHEMA}.layer_restrictionarea AS lra, {PGSCHEMA}.treeitem AS la "
+    "WHERE rra.role_id in (%role_ids%) AND rra.restrictionarea_id = ra.id "
+    "AND lra.restrictionarea_id = ra.id AND lra.layer_id = la.id AND la.name = "
+).format(PGSCHEMA=os.environ["PGSCHEMA"])
+os.environ["MAPSERVER_DATA_NOAREA_SUBSELECT"] = (
+    "SELECT rra.role_id "
+    "FROM {PGSCHEMA}.restrictionarea AS ra, {PGSCHEMA}.role_restrictionarea AS rra, "
+    "{PGSCHEMA}.layer_restrictionarea AS lra, {PGSCHEMA}.treeitem AS la "
+    "WHERE rra.restrictionarea_id = ra.id AND lra.restrictionarea_id = ra.id "
+    "AND lra.layer_id = la.id AND la.name = "
+).format(PGSCHEMA=os.environ["PGSCHEMA"])
+os.environ["MAPSERVER_JOIN_TABLES"] = (
+    "{PGSCHEMA}.restrictionarea AS ra, {PGSCHEMA}.role_restrictionarea AS rra, "
+    "{PGSCHEMA}.layer_restrictionarea AS lra, {PGSCHEMA}.treeitem AS la"
+).format(PGSCHEMA=os.environ["PGSCHEMA"])
+os.environ["MAPSERVER_JOIN_WHERE"] = (
+    "rra.role_id in (%role_ids%) AND rra.restrictionarea_id = ra.id AND "
+    "lra.restrictionarea_id = ra.id AND lra.layer_id = la.id AND la.name = "
+)
 
 SCHEME_PORT = {
     "http": 80,

geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl

@@ -16,7 +16,6 @@ services:
       - PGUSER
       - PGPASSWORD
       - PGDATABASE
-      - PGSCHEMA
       - PGSCHEMA_STATIC
       - GEOPORTAL_INTERNAL_URL
       - TILECLOUDCHAIN_INTERNAL_URL
@@ -31,20 +30,6 @@ services:
       - AWS_SECRET_ACCESS_KEY
       - AWS_DEFAULT_REGION
       - AWS_S3_ENDPOINT
-      - "MAPSERVER_DATA_SUBSELECT=SELECT ST_Collect(ra.area)
-        FROM ${PGSCHEMA}.restrictionarea AS ra, ${PGSCHEMA}.role_restrictionarea AS rra,
-        ${PGSCHEMA}.layer_restrictionarea AS lra, ${PGSCHEMA}.treeitem AS la
-        WHERE rra.role_id in (%role_ids%) AND rra.restrictionarea_id = ra.id
-        AND lra.restrictionarea_id = ra.id AND lra.layer_id = la.id AND la.name = "
-      - "MAPSERVER_DATA_NOAREA_SUBSELECT=SELECT rra.role_id
-        FROM ${PGSCHEMA}.restrictionarea AS ra, ${PGSCHEMA}.role_restrictionarea AS rra,
-        ${PGSCHEMA}.layer_restrictionarea AS lra, ${PGSCHEMA}.treeitem AS la
-        WHERE rra.restrictionarea_id = ra.id AND lra.restrictionarea_id = ra.id
-        AND lra.layer_id = la.id AND la.name = "
-      - "MAPSERVER_JOIN_TABLES=${PGSCHEMA}.restrictionarea AS ra, ${PGSCHEMA}.role_restrictionarea AS rra,
-        ${PGSCHEMA}.layer_restrictionarea AS lra, ${PGSCHEMA}.treeitem AS la"
-      - "MAPSERVER_JOIN_WHERE=rra.role_id in (%role_ids%) AND rra.restrictionarea_id = ra.id AND
-        lra.restrictionarea_id = ra.id AND lra.layer_id = la.id AND la.name = "
 
   print:
     image: camptocamp/mapfish_print:3.16
@@ -73,7 +58,6 @@ services:
       - PGUSER
       - PGPASSWORD
       - PGDATABASE
-      - PGSCHEMA
       - PGSCHEMA_STATIC
       - C2C_REDIS_URL
       - C2C_BROADCAST_PREFIX
@@ -166,7 +150,6 @@ services:
       - PGUSER
       - PGPASSWORD
       - PGDATABASE
-      - PGSCHEMA
       - PGSCHEMA_STATIC
       - GUNICORN_PARAMS
       - VISIBLE_WEB_HOST
@@ -201,7 +184,6 @@ services:
       - PGUSER
       - PGPASSWORD
       - PGDATABASE
-      - PGSCHEMA
       - PGSCHEMA_STATIC
 
   front:

geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml

@@ -9,6 +9,8 @@ services:
     extends:
       file: docker-compose-lib.yaml
       service: config
+      environment:
+        - PGSCHEMA
 
   ## print:
   ##   extends:
@@ -33,12 +35,13 @@ services:
   ##   volumes_from:
   ##     - config:ro
   ##   environment:
+  ##     - PGSCHEMA
   ##     # Single QGIS project files
-  ##     QGIS_PROJECT_FILE: /etc/qgisserver/project.qgz
-  ##     GEOMAPFISH_OGCSERVER: <OGC server name>
+  ##     - QGIS_PROJECT_FILE=/etc/qgisserver/project.qgz
+  ##     - GEOMAPFISH_OGCSERVER=<OGC server name>
   ##     # Multiple QGIS project files
-  ##     # QGIS_PROJECT_FILE:
-  ##     # GEOMAPFISH_ACCESSCONTROL_CONFIG: /etc/qgisserver/accesscontrol_config.yaml
+  ##     - QGIS_PROJECT_FILE=
+  ##     - GEOMAPFISH_ACCESSCONTROL_CONFIG=/etc/qgisserver/accesscontrol_config.yaml
 
   tinyows:
     extends:
@@ -84,11 +87,15 @@ services:
       service: geoportal
     volumes:
       - /var/sig:/var/sig:ro
+    environment:
+      - PGSCHEMA
 
   alembic:
     extends:
       file: docker-compose-lib.yaml
       service: alembic
+    environment:
+      - PGSCHEMA
 
   front:
     extends:

geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_Makefile_tmpl

@@ -25,6 +25,7 @@ DOCKER_PGHOST_SLAVE ?= 172.17.0.1
 DOCKER_PGPORT ?= 5432
 DOCKER_PGDATABASE ?= geomapfish
 DOCKER_PGSCHEMA ?= main
+PGSCHEMA ?= main
 DOCKER_PGSCHEMA_STATIC ?= main_static
 export DOCKER_PORT
 export DOCKER_BASE
@@ -696,7 +697,8 @@ docker-build-config: $(shell docker-required --path .) \
 		$(PRINT_CONFIG_FILE) \
 		$(MAPCACHE_FILE) \
 		qgisserver/geomapfish.yaml
-	docker build --tag=$(DOCKER_BASE)-config:$(DOCKER_TAG) .
+	docker build --tag=$(DOCKER_BASE)-config:$(DOCKER_TAG) \
+		--build-arg=PGSCHEMA=$(PGSCHEMA) .
 
 .PHONY: docker-build-geoportal
 docker-build-geoportal: $(shell docker-required --path geoportal) \
@@ -705,7 +707,8 @@ docker-build-geoportal: $(shell docker-required --path geoportal) \
 		geoportal/config.yaml \
 		geoportal/alembic.ini \
 		geoportal/alembic.yaml
-	docker build --tag=$(DOCKER_BASE)-geoportal:$(DOCKER_TAG) --build-arg=GIT_HASH=$(GIT_HASH) geoportal
+	docker build --tag=$(DOCKER_BASE)-geoportal:$(DOCKER_TAG) \
+		--build-arg=GIT_HASH=$(GIT_HASH) geoportal
 
 .PHONY: push-docker
 push-docker: