From 516a9c9d8a9160e262e711396154f42725bc190c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com>
Date: Thu, 3 Mar 2022 16:29:20 +0100
Subject: [PATCH] Bi able to have different credential for OSM database

---
 env.project                    |   5 +
 mapserver/osm-basemap.map.tmpl | 200 ++++++++++++++++-----------------
 secrets.tar.bz2.gpg            | Bin 1851 -> 1801 bytes
 3 files changed, 105 insertions(+), 100 deletions(-)

diff --git a/env.project b/env.project
index 061ec0f29..3dafaf7d6 100644
--- a/env.project
+++ b/env.project
@@ -12,6 +12,11 @@ PGSSLMODE=require
 PGSCHEMA=main_2_7
 PGSCHEMA_STATIC=static_2_7
 
+OSM_PGHOST=pg-gs.camptocamp.com
+OSM_PGHOST_SLAVE=pg-gs.camptocamp.com
+OSM_PGPORT=30100
+OSM_PGPORT_SLAVE=30101
+
 # For Exoscale S3
 AWS_DEFAULT_REGION=ch-dk-2
 AWS_S3_ENDPOINT=sos-ch-dk-2.exo.io
diff --git a/mapserver/osm-basemap.map.tmpl b/mapserver/osm-basemap.map.tmpl
index ac3e00286..23dabe1d8 100644
--- a/mapserver/osm-basemap.map.tmpl
+++ b/mapserver/osm-basemap.map.tmpl
@@ -16,7 +16,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places0"
  MINSCALEDENOM 332808204
  MAXSCALEDENOM 99999999999
@@ -44,7 +44,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places1"
  MINSCALEDENOM 166404102
  MAXSCALEDENOM 332808204
@@ -72,7 +72,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places2"
  MINSCALEDENOM 83202051
  MAXSCALEDENOM 166404102
@@ -117,7 +117,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places3"
  MINSCALEDENOM 41601025
  MAXSCALEDENOM 83202051
@@ -175,7 +175,7 @@ LAYER
     NAME "landuse4"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -252,7 +252,7 @@ LAYER
     NAME "waterarea4"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 41601025
     MINSCALEDENOM 20800512
@@ -281,7 +281,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places4"
  MINSCALEDENOM 20800512
  MAXSCALEDENOM 41601025
@@ -339,7 +339,7 @@ LAYER
     NAME "landuse5"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -416,7 +416,7 @@ LAYER
     NAME "waterarea5"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 20800512
     MINSCALEDENOM 10400256
@@ -448,7 +448,7 @@ LAYER
     MAXSCALEDENOM 20800512
     NAME "roads5"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -475,7 +475,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places5"
  MINSCALEDENOM 10400256
  MAXSCALEDENOM 20800512
@@ -533,7 +533,7 @@ LAYER
     NAME "landuse6"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -610,7 +610,7 @@ LAYER
     NAME "waterarea6"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 10400256
     MINSCALEDENOM 5200128
@@ -653,7 +653,7 @@ LAYER
     NAME "waterways6"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 10400256
@@ -708,7 +708,7 @@ LAYER
     MAXSCALEDENOM 10400256
     NAME "roads6"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -735,7 +735,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places6"
  MINSCALEDENOM 5200128
  MAXSCALEDENOM 10400256
@@ -793,7 +793,7 @@ LAYER
     NAME "landuse7"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -870,7 +870,7 @@ LAYER
     NAME "waterarea7"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 5200128
     MINSCALEDENOM 2600064
@@ -913,7 +913,7 @@ LAYER
     NAME "waterways7"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 5200128
@@ -968,7 +968,7 @@ LAYER
     MAXSCALEDENOM 5200128
     NAME "roads7"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -995,7 +995,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places7"
  MINSCALEDENOM 2600064
  MAXSCALEDENOM 5200128
@@ -1053,7 +1053,7 @@ LAYER
     NAME "landuse8"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon)            as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -1130,7 +1130,7 @@ LAYER
     NAME "waterarea8"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 2600064
     MINSCALEDENOM 1300032
@@ -1173,7 +1173,7 @@ LAYER
     NAME "waterways8"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 2600064
@@ -1224,7 +1224,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 1300032
     MAXSCALEDENOM 2600064
     TYPE LINE
@@ -1261,7 +1261,7 @@ LAYER
     MAXSCALEDENOM 2600064
     NAME "roads8"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('trunk', 'motorway', 'primary') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -1295,7 +1295,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places8"
  MINSCALEDENOM 1300032
  MAXSCALEDENOM 2600064
@@ -1360,7 +1360,7 @@ LAYER
     NAME "landuse9"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, landuse AS type FROM planet_osm_polygon WHERE landuse in ('forest', 'industrial', 'commercial', 'residential')) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -1437,7 +1437,7 @@ LAYER
     NAME "waterarea9"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 1300032
     MINSCALEDENOM 650016
@@ -1480,7 +1480,7 @@ LAYER
     NAME "waterways9"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 1300032
@@ -1531,7 +1531,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 650016
     MAXSCALEDENOM 1300032
     TYPE LINE
@@ -1568,7 +1568,7 @@ LAYER
     MAXSCALEDENOM 1300032
     NAME "roads9"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line WHERE highway in ('secondary', 'trunk', 'motorway', 'primary') ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -1623,7 +1623,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places9"
  MINSCALEDENOM 650016
  MAXSCALEDENOM 1300032
@@ -1688,7 +1688,7 @@ LAYER
     NAME "landuse10"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, landuse AS type FROM planet_osm_polygon WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -1765,7 +1765,7 @@ LAYER
     NAME "waterarea10"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 650016
     MINSCALEDENOM 325008
@@ -1808,7 +1808,7 @@ LAYER
     NAME "waterways10"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 650016
@@ -1873,7 +1873,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 325008
     MAXSCALEDENOM 650016
     TYPE LINE
@@ -1910,7 +1910,7 @@ LAYER
     MAXSCALEDENOM 650016
     NAME "roads10"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -2000,7 +2000,7 @@ LAYER
     TYPE LINE
     NAME "aeroways10"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -2032,7 +2032,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places10"
  MINSCALEDENOM 325008
  MAXSCALEDENOM 650016
@@ -2091,7 +2091,7 @@ LAYER
     NAME "landuse11"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, landuse AS type FROM planet_osm_polygon WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -2197,7 +2197,7 @@ LAYER
     NAME "waterarea11"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 325008
     MINSCALEDENOM 162504
@@ -2240,7 +2240,7 @@ LAYER
     NAME "waterways11"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line WHERE waterway='river') as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 325008
@@ -2305,7 +2305,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 162504
     MAXSCALEDENOM 325008
     TYPE LINE
@@ -2342,7 +2342,7 @@ LAYER
     MAXSCALEDENOM 325008
     NAME "roads11"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -2439,7 +2439,7 @@ LAYER
     TYPE LINE
     NAME "aeroways11"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -2471,7 +2471,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places11"
  MINSCALEDENOM 162504
  MAXSCALEDENOM 325008
@@ -2553,7 +2553,7 @@ LAYER
     NAME "landuse12"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -2751,7 +2751,7 @@ LAYER
     NAME "waterarea12"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 162504
     MINSCALEDENOM 81252
@@ -2794,7 +2794,7 @@ LAYER
     NAME "waterways12"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 162504
@@ -2873,7 +2873,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 81252
     MAXSCALEDENOM 162504
     TYPE LINE
@@ -2910,7 +2910,7 @@ LAYER
     MAXSCALEDENOM 162504
     NAME "roads12"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -3022,7 +3022,7 @@ LAYER
     TYPE LINE
     NAME "aeroways12"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -3054,7 +3054,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places12"
  MINSCALEDENOM 81252
  MAXSCALEDENOM 162504
@@ -3130,7 +3130,7 @@ LAYER
     NAME "landuse13"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -3328,7 +3328,7 @@ LAYER
     NAME "waterarea13"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 81252
     MINSCALEDENOM 40626
@@ -3371,7 +3371,7 @@ LAYER
     NAME "waterways13"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 81252
@@ -3450,7 +3450,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 40626
     MAXSCALEDENOM 81252
     TYPE LINE
@@ -3487,7 +3487,7 @@ LAYER
     MAXSCALEDENOM 81252
     NAME "roads13"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway AS type FROM planet_osm_line ORDER BY z_order asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -3627,7 +3627,7 @@ LAYER
     TYPE LINE
     NAME "aeroways13"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -3659,7 +3659,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places13"
  MINSCALEDENOM 40626
  MAXSCALEDENOM 81252
@@ -3752,7 +3752,7 @@ LAYER
     NAME "landuse14"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -3950,7 +3950,7 @@ LAYER
     NAME "waterarea14"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 40626
     MINSCALEDENOM 20313
@@ -3993,7 +3993,7 @@ LAYER
     NAME "waterways14"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 40626
@@ -4072,7 +4072,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 20313
     MAXSCALEDENOM 40626
     TYPE LINE
@@ -4109,7 +4109,7 @@ LAYER
     MAXSCALEDENOM 40626
     NAME "roads14"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -4438,7 +4438,7 @@ LAYER
     TYPE LINE
     NAME "aeroways14"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -4470,7 +4470,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places14"
  MINSCALEDENOM 20313
  MAXSCALEDENOM 40626
@@ -4557,7 +4557,7 @@ LAYER
     NAME "landuse15"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -4755,7 +4755,7 @@ LAYER
     NAME "waterarea15"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 20313
     MINSCALEDENOM 10156
@@ -4798,7 +4798,7 @@ LAYER
     NAME "waterways15"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 20313
@@ -4877,7 +4877,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 10156
     MAXSCALEDENOM 20313
     TYPE LINE
@@ -4914,7 +4914,7 @@ LAYER
     MAXSCALEDENOM 20313
     NAME "roads15"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -5307,7 +5307,7 @@ LAYER
     TYPE LINE
     NAME "aeroways15"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -5343,7 +5343,7 @@ LAYER
     NAME "buildings15"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -5379,7 +5379,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places15"
  MINSCALEDENOM 10156
  MAXSCALEDENOM 20313
@@ -5466,7 +5466,7 @@ LAYER
     NAME "landuse16"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -5664,7 +5664,7 @@ LAYER
     NAME "waterarea16"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 10156
     MINSCALEDENOM 5078
@@ -5707,7 +5707,7 @@ LAYER
     NAME "waterways16"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 10156
@@ -5786,7 +5786,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 5078
     MAXSCALEDENOM 10156
     TYPE LINE
@@ -5823,7 +5823,7 @@ LAYER
     MAXSCALEDENOM 10156
     NAME "roads16"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -6216,7 +6216,7 @@ LAYER
     TYPE LINE
     NAME "aeroways16"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -6252,7 +6252,7 @@ LAYER
     NAME "buildings16"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -6288,7 +6288,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places16"
  MINSCALEDENOM 5078
  MAXSCALEDENOM 10156
@@ -6358,7 +6358,7 @@ LAYER
     NAME "landuse17"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -6556,7 +6556,7 @@ LAYER
     NAME "waterarea17"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 5078
     MINSCALEDENOM 2539
@@ -6599,7 +6599,7 @@ LAYER
     NAME "waterways17"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 5078
@@ -6678,7 +6678,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 2539
     MAXSCALEDENOM 5078
     TYPE LINE
@@ -6715,7 +6715,7 @@ LAYER
     MAXSCALEDENOM 5078
     NAME "roads17"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -7108,7 +7108,7 @@ LAYER
     TYPE LINE
     NAME "aeroways17"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -7144,7 +7144,7 @@ LAYER
     NAME "buildings17"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -7180,7 +7180,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places17"
  MINSCALEDENOM 2539
  MAXSCALEDENOM 5078
@@ -7250,7 +7250,7 @@ LAYER
     NAME "landuse18"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, landuse AS type, name FROM planet_osm_polygon       WHERE landuse in ('forest', 'pedestrian', 'cemetery', 'industrial', 'commercial',      'brownfield', 'residential', 'school', 'college', 'university',      'military', 'park', 'golf_course', 'hospital', 'parking', 'stadium', 'sports_center',      'pitch') ORDER BY way_area desc) as foo USING unique osm_id USING srid=2056"
     PROCESSING "LABEL_NO_CLIP=ON"
     PROCESSING "CLOSE_CONNECTION=DEFER"
@@ -7448,7 +7448,7 @@ LAYER
     NAME "waterarea18"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name, water AS type FROM planet_osm_polygon WHERE water IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     MAXSCALEDENOM 2539
     MINSCALEDENOM 0
@@ -7491,7 +7491,7 @@ LAYER
     NAME "waterways18"
     GROUP "default"
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, waterway AS type, name FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     MAXSCALEDENOM 2539
@@ -7570,7 +7570,7 @@ LAYER
     GROUP "default"
     STATUS ON
     CONNECTIONTYPE POSTGIS
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     MINSCALEDENOM 0
     MAXSCALEDENOM 2539
     TYPE LINE
@@ -7607,7 +7607,7 @@ LAYER
     MAXSCALEDENOM 2539
     NAME "roads18"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT osm_id, way AS geometry, name, ref, highway||osm_to_boolean(bridge)||osm_to_boolean(tunnel) as type FROM planet_osm_line ORDER BY z_order asc, st_length(way) asc) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     CLASSITEM "type"
@@ -8000,7 +8000,7 @@ LAYER
     TYPE LINE
     NAME "aeroways18"
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, aeroway AS type FROM planet_osm_line) as foo USING unique osm_id USING srid=2056"
     CLASSITEM "type"
     CLASS
@@ -8036,7 +8036,7 @@ LAYER
     NAME "buildings18"
     TYPE POLYGON
     CONNECTIONTYPE postgis
-    CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+    CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
     DATA "geometry FROM (SELECT way AS geometry, osm_id, name FROM planet_osm_polygon WHERE building IS NOT NULL) as foo USING unique osm_id USING srid=2056"
     LABELITEM "name"
     PROCESSING "LABEL_NO_CLIP=ON"
@@ -8072,7 +8072,7 @@ LAYER
  GROUP "default"
  TYPE POINT
  CONNECTIONTYPE postgis
- CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} user=${PGUSER} password=${PGPASSWORD} dbname=${OSM_PGDATABASE}"
+ CONNECTION "host=${OSM_PGHOST_SLAVE} port=${OSM_PGPORT_SLAVE} user=${OSM_PGUSER} password=${OSM_PGPASSWORD} dbname=${OSM_PGDATABASE}"
  NAME "places18"
  MINSCALEDENOM 0
  MAXSCALEDENOM 2539
diff --git a/secrets.tar.bz2.gpg b/secrets.tar.bz2.gpg
index 22b3dd86edada3349187f9bf4f38df5a883aabc3..f6e055dfe24fab5fed8e48bc7374e4dfeef6e96c 100644
GIT binary patch
literal 1801
zcmV+k2ln`k4Fm}T0+$_!<)ny!0RPg)HvufzW$v-#G3`XeMb+Aai4bG8Z@LT+L6=ca
z-9i6dN*0HEVqVzJwQb<4g!g|CH627=?}g5vOnjLeP4C0+=MD6!vxQ%ufBcv2N_EK6
ztWV0V2m1(}aJv44PAK`$i)HN4kRA-<k&e?mE-Em#2j*AV`Wjx;1!;ZTVYy*`i`zkX
z7?~)gr&bJ6QaYcXJ_^?Q^y6B8kbpoFpsGS%mvzkd3?LO;BNmkb^**#{QH$83(Mpe^
z7V6)-6DmONR^^Ue28ur~peT2+Bak@(%9$+yM<9Top**?rWco8SBlu+}Q`%(1rU>Rf
zXUPutSY>pSgsSgI`@MPxZE3YGXXRAg<`b}&LH$<MonONaMaI-W3H2B<!d)oTTadL3
zQVXU*yUD&uhK-Whi81QWGqTHR46i_U27A2>yCurVj#eRQgrx+jYz#(O>hl}1r6o5B
z8hci)pnv$QYcTvfoJiTzPZkY41B&8<Q;7mETUrPni4i+m-HONslvFi3qGhqqw`s+u
zVA<r4&ubwUGpfLHBm@U2^^DI)+bnIf046mz2mG){46RYkF*1!6rjiX>)14tB#10I+
zZHm=m2gI+vUlptL97wqEJ3AuB@=^}9r%6^1-8F=Cmg3Is_m6)g0`<$2qK9f%fwx+<
z@Lg+Saz?1H^j&bTB$EO>heS);Ui0||I+E#_tQ&jO=i_gSk1f5Seq>Zd9033M;%R%4
zngjRbhAOaOpAC-KQ9<dMQGQ`azCRcucXxmC`iH6~{n-yLq0gHfbsr|ORVPz%Z2&r>
z<l%h2-^r<tFB9HGqJ`Q8umel8*)xjx6}rpsvP4d$`~tnZ8mdp`nCDVYynJ$ZBRDN+
zYY^gOs#GHlu8n9jtDMicRp3cRtyld2g>@Jz%uZC1wX~A~dsE>haztR++*J;JI@O-4
zeO(FT%&49vrgPX1Bvb^h^q3&DOe(`U3_K4Nu3Y<~U_D)?RX|_4vm`dRcrztq%6|dA
zh`W8iVBOV?bo;~qQ89TzF~_AZ72*Q*Xj}P_>R%YoVvz6nqst6(|CQ<4ud4~yqyd6w
zw`yrwmh`nXaO4Wne*=}{r#*QKYg~%-vZCN))dco4&Nc7sAa>iiX5b)49F0n`97*PS
z+u`2&L6N35SLDt2(a^<3L58WHx-d^6gmFG}A?|c&d=rO)$`5~Y>Y-#+rkf~+2aj$q
zFtG67iX+R1T9T0YapxRPaGHGG@gZ~W!KOgJaUAdl;X>aS;<pSqeEMz01(0prY<ggN
zGI^S|R`BIH|3w$nK19Ikoe+ce*0%o(i2LMKUBTW79O_2HP}zhQde3R3TzZz;f=SYl
zJ+q_6sXjD7zIq4Niy{nS#MdmEly%R7gKxQ%2yn>DhQs7y@kvK|pxTa=y@O-;=>9gh
zevZxFkLq?LAaF*+z+U$=9u`)QtNACOhq&3--H-Y`!pURF?C56xji=?hBm2kweY?`q
z07##NE}^O(2KF|^VORtG|C6#Fz+)tGu|Jx&g^n}unK=c_K}3(OM>pF5o|CpR>aCd|
zFFXNR)mAGeULUa?`Hr5<-(os=G?3zI#e+R=!J|wjTq0^z1gM(>fp<o!4(>vm{<x59
z04L3_6hw23Y14sqn06D6D)QIK+=<qNDu`(Bu_^nb%9AZv3mILVg4ebtH<<;Az{nQJ
zK@DjRbcxGG9m;}4No$4M?A+3uQz#ZMy%<BqM^Ur@BP#=Vgej>91lg6Z5WevUpmLRi
zGrqQYq_Z8|F=02vo0*QP;Z-rCoG8yqGmBZ74e6r%TBfKwseY%^JRzATV@H0B9J|^q
zxMBTX9HZcW&kjq17pu^~<{xx;#PL;pWrIfjWP3IJ%-DBF@`ETj0uzyspM!zQTcLnA
zp9^_?@z3jT2hF$WXN<<GkB3hyC!YfDkOO^5)<FZ!IA%KojbbgddQ_STGPUKfdp<66
zOs>UW3N+mLf*q&iIVh*mAO$GgPKotQkHe1-+>SF^%Iv7*Bg1wR&$9%K^H0*t$@{ar
zahHq0MB0DSvdHAV88UT)oztk>L&Y^>2vezH-ZzG$&7$uggv)=k;I{l?lIXSmlqU{q
z&11Lm`3iwAPmt?}V5Gwcyg_=qwhFA3sl4Hp=tB9>VltcBE<3|K?EqyudHGS&NDD{(
zcvd<&y0a>6cXe;$wa3QED`Cdx3Kj2$kKW%Nq992GGR(&wEGvSMa>u5nJLn)i0>!?+
zTr$$9KG48&t=hptk-F+JVylum?{Kn^b>y880E?p7fUq~mdHi(tuABMN6qc2<dZURu
rVUsem7Nv6-M<)nxpF)*VcZ;W$x?IrDHna6`XT}&!BZCTn2TUmdSaOCP

literal 1851
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