Make setup for automatic updates optional through UPDATES variable

Dockerfile

@@ -151,12 +151,12 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \
   && ln -sf /dev/stderr /var/log/apache2/error.log
 
 # Configure PosgtreSQL
-COPY postgresql.custom.conf.tmpl /etc/postgresql/10/main/
+COPY postgresql.custom.conf.tmpl /etc/postgresql/12/main/
 RUN chown -R postgres:postgres /var/lib/postgresql \
-  && chown postgres:postgres /etc/postgresql/10/main/postgresql.custom.conf.tmpl \
-  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/10/main/postgresql.conf
-RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/10/main/pg_hba.conf \
-      && echo "host all all ::/0 md5" >> /etc/postgresql/10/main/pg_hba.conf
+  && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \
+  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/12/main/postgresql.conf
+RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/12/main/pg_hba.conf \
+      && echo "host all all ::/0 md5" >> /etc/postgresql/12/main/pg_hba.conf
 
 # copy update scripts
 COPY openstreetmap-tiles-update-expire /usr/bin/

README.md

@@ -22,10 +22,11 @@ If the container exits without errors, then your data has been successfully impo
 
 ### Automatic updates (optional)
 
-If your import is an extract of the planet and has polygonal bounds associated with it, like those from geofabrik.de, then it is possible to set your server up for automatic updates. Make sure to reference both the OSM file and the polygon file during the import process to facilitate this:
+If your import is an extract of the planet and has polygonal bounds associated with it, like those from geofabrik.de, then it is possible to set your server up for automatic updates. Make sure to reference both the OSM file and the polygon file during the import process to facilitate this, and also include the `UPDATES=enabled` variable:
 
 ```
 docker run \
+    -e UPDATES=enabled \
     -v /absolute/path/to/luxembourg.osm.pbf:/data.osm.pbf \
     -v /absolute/path/to/luxembourg.poly:/data.poly \
     -v openstreetmap-data:/var/lib/postgresql/12/main \
@@ -33,7 +34,7 @@ docker run \
     import
 ```
 
-Refer to the section *Automatic updating and tile expiry* to actually enable the updates.
+Refer to the section *Automatic updating and tile expiry* to actually enable the updates while running the tile server.
 
 ## Running the server
 
@@ -67,7 +68,7 @@ docker run \
 
 ### Enabling automatic updating (optional)
 
-Given that you've specified both the OSM data and polygon as specified in the *Automatic updates* section during server setup, you can enable the updating process by setting the variable `UPDATES` to `enabled`:
+Given that you've set up your import as described in the *Automatic updates* section during server setup, you can enable the updating process by setting the `UPDATES` variable while running your server as well:
 
 ```
 docker run \

run.sh

@@ -42,6 +42,7 @@ if [ "$1" = "import" ]; then
         wget -nv http://download.geofabrik.de/europe/luxembourg.poly -O /data.poly
     fi
 
+    if [ "$UPDATES" = "enabled" ]; then
         # determine and set osmosis_replication_timestamp (for consecutive updates)
         osmium fileinfo /data.osm.pbf > /var/lib/mod_tile/data.osm.pbf.info
         osmium fileinfo /data.osm.pbf | grep 'osmosis_replication_timestamp=' | cut -b35-44 > /var/lib/mod_tile/replication_timestamp.txt
@@ -49,6 +50,7 @@ if [ "$1" = "import" ]; then
 
         # initial setup of osmosis workspace (for consecutive updates)
         sudo -u renderer openstreetmap-tiles-update-expire $REPLICATION_TIMESTAMP
+    fi
 
     # copy polygon file if available
     if [ -f /data.poly ]; then