From 54cce0cafc4af28d45de3460e5d23357ea7c4550 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 26 Sep 2018 09:22:09 +0300 Subject: [PATCH] URL_LATEST, URL_UPDATES env --- README.md | 2 ++ osm-loader.pl | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 77b602c..6cac3b1 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ To run this container with local PostgreSQL (not docker-packaged): -v /var/run/postgresql:/var/run/postgresql \ --env PG_ENV_OSM_USER= \ --env PG_ENV_OSM_DB= \ + --env PG_ENV_OSM_HOST= \ --env PG_ENV_OSM_PASSWORD= vitalif/renderd-osm To run with postgresql from another docker container: @@ -30,6 +31,7 @@ To run with postgresql from another docker container: --link postgres-osm:pg \ --env PG_ENV_OSM_USER= \ --env PG_ENV_OSM_DB= \ + --env PG_ENV_OSM_HOST= \ --env PG_ENV_OSM_PASSWORD= vitalif/renderd-osm Also you may override host and port with PG_ENV_OSM_HOST and PG_ENV_OSM_PORT, diff --git a/osm-loader.pl b/osm-loader.pl index e5c79f7..161ffc1 100755 --- a/osm-loader.pl +++ b/osm-loader.pl @@ -1,5 +1,6 @@ #!/usr/bin/perl -# Configuration in env: OSM_CACHE_DIR, OSM_CARTO_DIR + same Docker env vars +# Configuration in env: OSM_CACHE_DIR, OSM_CARTO_DIR, URL_LATEST, URL_UPDATES, +# plus PG_ENV_OSM_{DB,HOST,PORT,USER,PASSWORD} like in README for the render server itself use strict; use DBI; @@ -7,8 +8,8 @@ use POSIX; my $dir = $ENV{OSM_CACHE_DIR} || '/var/lib/mod_tile/downloads'; my $carto_dir = '/usr/share/mapnik/openstreetmap-carto-'.$ENV{OSM_CARTO_VERSION}; -my $url_latest = 'http://download.geofabrik.de/russia-latest.osm.pbf'; -my $url_updates = 'http://download.geofabrik.de/russia-updates'; +my $url_latest = $ENV{URL_LATEST} || 'http://download.geofabrik.de/russia-latest.osm.pbf'; +my $url_updates = $ENV{URL_UPDATES} || 'http://download.geofabrik.de/russia-updates'; my $url_gislab_dump = 'http://be.gis-lab.info/data/osm_dump/dump/RU/RU-'; my $url_gislab_diff = 'http://be.gis-lab.info/data/osm_dump/diff/RU/RU-';