This is an automated email from the git hooks/post-receive script. rubund-guest pushed a commit to branch master in repository osm-tile-server.
commit d00b520839df0df0c6f22d80c355dd7875e9033d Author: Ruben Undheim <[email protected]> Date: Sun Sep 6 17:56:02 2015 +0200 Also include URL in etc file --- etc/osm-tile-server.conf | 7 ++++--- scripts/osm-tile-server-download | 4 +++- src/parse-settings.c | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/etc/osm-tile-server.conf b/etc/osm-tile-server.conf index c904919..a94c817 100644 --- a/etc/osm-tile-server.conf +++ b/etc/osm-tile-server.conf @@ -1,5 +1,6 @@ DBNAME="" -SLIM=true -CACHE_STRATEGY=sparse -MEMORY=100 +IMPORT_SLIM=true +IMPORT_CACHE_STRATEGY=sparse +IMPORT_MEMORY=100 +SRC_URL="http://download.geofabrik.de"; diff --git a/scripts/osm-tile-server-download b/scripts/osm-tile-server-download index 5bc4e31..a263546 100755 --- a/scripts/osm-tile-server-download +++ b/scripts/osm-tile-server-download @@ -2,9 +2,11 @@ umask 002 +source /etc/osm-tile-server-base.conf + REGION=`cat /var/lib/osm-tile-server-base/selected_region.txt` FILENAME="downloaded.osm.pbf" -URL="http://download.geofabrik.de/${REGION}-latest.osm.pbf"; +URL="${SRC_URL}/${REGION}-latest.osm.pbf" COMMAND="wget -O /var/cache/osm-tile-server-base/${FILENAME} ${URL}" echo "The following command will be run to download:\n\n" echo " ${COMMAND}\n\n" diff --git a/src/parse-settings.c b/src/parse-settings.c index 99e1870..de67fb1 100644 --- a/src/parse-settings.c +++ b/src/parse-settings.c @@ -39,11 +39,11 @@ void parse_settings() const char *l = linebuf; if(parse_one(l,"DBNAME=",cfg_dbname) == 0){ } - else if(parse_one(l,"SLIM=",cfg_slim) == 0){ + else if(parse_one(l,"IMPORT_SLIM=",cfg_slim) == 0){ } - else if(parse_one(l,"CACHE_STRATEGY=",cfg_cache_strategy) == 0){ + else if(parse_one(l,"IMPORT_CACHE_STRATEGY=",cfg_cache_strategy) == 0){ } - else if(parse_one(l,"MEMORY=",cfg_memory) == 0){ + else if(parse_one(l,"IMPORT_MEMORY=",cfg_memory) == 0){ } } fclose(infile); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
