From 07d38f61352be1f0ba6692ef9fe1d341dd998e49 Mon Sep 17 00:00:00 2001
From: Greg <galewis1721@gmail.com>
Date: Wed, 16 Feb 2022 15:52:02 -0500
Subject: [PATCH] switch back to defined filenames for style

---
 README.md                         |  4 ++++
 openstreetmap-tiles-update-expire |  2 +-
 run.sh                            | 10 +++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e6cb7b2..838ac27 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,10 @@ By default the container will fetch openstreetmap-carto if it is not specified.
 docker run \
     -e DOWNLOAD_PBF=https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf \
     -e DOWNLOAD_POLY=https://download.geofabrik.de/europe/luxembourg.poly \
+    -e NAME_LUA=sample.lua
+    -e NAME_STYLE=test.style
+    -e NAME_MML=project.mml
+    -e NAME_SQL=test.sql
     -v /home/user/openstreetmap-caro-modified:/home/renderer/src/openstreetmap-carto \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
     overv/openstreetmap-tile-server \
diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire
index f02f487..5e2850e 100755
--- a/openstreetmap-tiles-update-expire
+++ b/openstreetmap-tiles-update-expire
@@ -20,7 +20,7 @@ OSM2PGSQL_BIN=osm2pgsql
 TRIM_BIN=/home/$ACCOUNT/src/regional/trim_osc.py
 
 DBNAME=gis
-OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/*.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/*.style ${OSM2PGSQL_EXTRA_ARGS}"
+OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/${NAME_LUA:-openstreetmap-carto.lua} --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/${NAME_STYLE:-openstreetmap-carto.style} ${OSM2PGSQL_EXTRA_ARGS}"
 
 #------------------------------------------------------------------------------
 # When using trim_osc.py we can define either a bounding box (such as this
diff --git a/run.sh b/run.sh
index 1eec82a..0a03102 100755
--- a/run.sh
+++ b/run.sh
@@ -22,6 +22,10 @@ if [ "$#" -ne 1 ]; then
     echo "environment variables:"
     echo "    THREADS: defines number of threads used for importing / tile rendering"
     echo "    UPDATES: consecutive updates (enabled/disabled)"
+    echo "    NAME_LUA: name of .lua script to run as part of the style"
+    echo "    NAME_STYLE: name of the .style to use"
+    echo "    NAME_MML: name of the .mml file to render to mapnik.xml"
+    echo "    NAME_SQL: name of the .sql file to use"
     exit 1
 fi
 
@@ -36,7 +40,7 @@ fi
 if [ ! -f /home/renderer/src/openstreetmap-carto/mapnik.xml ]; then
 
     cd /home/renderer/src/openstreetmap-carto
-    carto *.mml > mapnik.xml
+    carto ${NAME_MML:-project.mml} > mapnik.xml
 
 fi
 
@@ -91,10 +95,10 @@ if [ "$1" = "import" ]; then
     fi
 
     # Import data
-    sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/*.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/*.style /data.osm.pbf ${OSM2PGSQL_EXTRA_ARGS:-}
+    sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/${NAME_LUA:-openstreetmap-carto.lua} --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/${NAME_STYLE:-openstreetmap-carto.style} /data.osm.pbf ${OSM2PGSQL_EXTRA_ARGS:-}
 
     # Create indexes
-    sudo -u postgres psql -d gis -f /home/renderer/src/openstreetmap-carto/*.sql
+    sudo -u postgres psql -d gis -f /home/renderer/src/openstreetmap-carto/${NAME_SQL:-indexes.sql}
 
     #Import external data
     sudo chown -R renderer: /home/renderer/src