Fix database/password var names

mobidata-bw · Sep 26, 2023 · 075fc4e · 075fc4e
1 parent 78e5e81
commit 075fc4e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/etc/geoserver/workspaces/MobiData-BW/gtfs-db/datastore.xml b/etc/geoserver/workspaces/MobiData-BW/gtfs-db/datastore.xml
@@ -14,7 +14,14 @@
     <entry key="encode functions">true</entry>
     <entry key="Batch insert size">1</entry>
     <entry key="preparedStatements">false</entry>
-    <entry key="database">${IPL_GTFS_DB_POSTGRES_DB}</entry>
+    <!--
+      We have to use the very generic `PGDATABASE` (we access >1 PostgreSQL
+      DB from the GeoServer, after all) here because
+      1. gtfs-importer writes this variabl name into .imported-gtfs-db.env,
+      2. we directly source this env file in `geoserver`'s Compose spec,
+      3. we generate `geoserver`'s config file from the Compose env vars.
+    -->
+    <entry key="database">${PGDATABASE}</entry>
     <entry key="host">gtfs-db</entry>
     <entry key="Loose bbox">true</entry>
     <entry key="SSL mode">DISABLE</entry>
@@ -27,14 +34,7 @@
     <entry key="create database">false</entry>
     <entry key="Method used to simplify geometries">FAST</entry>
     <entry key="port">5432</entry>
-    <!--
-      We have to use the very generic `PGPASSWORD` (we access >1 PostgreSQL
-      DB from the GeoServer, after all) here because
-      1. gtfs-importer writes this variabl name into .imported-gtfs-db.env,
-      2. we directly source this env file in `geoserver`'s Compose spec,
-      3. we generate `geoserver`'s config file from the Compose env vars.
-    -->
-    <entry key="passwd">${PGPASSWORD}</entry>
+    <entry key="passwd">${IPL_GTFS_DB_POSTGRES_PASSWORD}</entry>
     <entry key="min connections">1</entry>
     <entry key="dbtype">postgis</entry>
     <entry key="namespace">mdbw</entry>