[osm-tile-server] 88/117: Copy style.xml to other directory

[Ruben Undheim]

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 aa37979a3d079e44c3b4fa33289facd51d64b7ad
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Sep 8 18:50:15 2015 +0200

    Copy style.xml to other directory
---
 debian/osm-tile-server-base.dirs     |  2 ++
 debian/osm-tile-server-base.postinst | 10 ++++++----
 debian/osm-tile-server-base.postrm   |  4 +++-
 etc/tilelite.wsgi                    |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/osm-tile-server-base.dirs b/debian/osm-tile-server-base.dirs
index 5dbaef0..c362773 100644
--- a/debian/osm-tile-server-base.dirs
+++ b/debian/osm-tile-server-base.dirs
@@ -1,2 +1,4 @@
 /var/cache/osm-tile-server-base
 /var/lib/osm-tile-server-base
+/var/lib/osm-tile-server-base/tilesets
+/var/lib/osm-tile-server-base/tilesets/default
diff --git a/debian/osm-tile-server-base.postinst b/debian/osm-tile-server-base.postinst
index 38b748b..f83b8ab 100644
--- a/debian/osm-tile-server-base.postinst
+++ b/debian/osm-tile-server-base.postinst
@@ -79,9 +79,11 @@ case "$1" in
             echo "DONE"
         fi
 
-        cp /usr/share/openstreetmap-carto/style.xml /usr/share/openstreetmap-carto/style-osm-tile-server.xml
+        cp /usr/share/openstreetmap-carto/style.xml /var/lib/osm-tile-server-base/tilesets/default/style.xml
 
-        sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\['${DBNAME}'\]\]/' /usr/share/openstreetmap-carto/style-osm-tile-server.xml
+        sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\['${DBNAME}'\]\]/' /var/lib/osm-tile-server-base/tilesets/default/style.xml
+        ln -sf /usr/share/openstreetmap-carto/data /var/lib/osm-tile-server-base/tilesets/default/data
+        ln -sf /usr/share/openstreetmap-carto/symbols /var/lib/osm-tile-server-base/tilesets/default/symbols
    
 
         sed -i 's/^DBNAME="[^"]*"/DBNAME="'${DBNAME}'"/' /etc/osm-tile-server.conf
@@ -145,9 +147,9 @@ case "$1" in
     triggered)
         db_get osm-tile-server/db-name
         DBNAME=$RET
-        cp /usr/share/openstreetmap-carto/style.xml /usr/share/openstreetmap-carto/style-osm-tile-server.xml
+        cp /usr/share/openstreetmap-carto/style.xml /var/lib/osm-tile-server-base/tilesets/default/style.xml
 
-        sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\['${DBNAME}'\]\]/' /usr/share/openstreetmap-carto/style-osm-tile-server.xml
+        sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\['${DBNAME}'\]\]/' /var/lib/osm-tile-server-base/tilesets/default/style.xml
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/osm-tile-server-base.postrm b/debian/osm-tile-server-base.postrm
index 140eee4..bc429e0 100644
--- a/debian/osm-tile-server-base.postrm
+++ b/debian/osm-tile-server-base.postrm
@@ -21,10 +21,12 @@ set -e
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-       rm -f /usr/share/openstreetmap-carto/style-osm-tile-server.xml 
        rm -f /var/lib/osm-tile-server-base/selected_region.txt
        rm -f /var/lib/osm-tile-server-base/status.txt
        rm -f /var/cache/osm-tile-server-base/downloaded.osm.pbf
+       rm -f /var/lib/osm-tile-server-base/tilesets/default/style.xml 
+       rm -f /var/lib/osm-tile-server-base/tilesets/default/data
+       rm -f /var/lib/osm-tile-server-base/tilesets/default/symbols
     ;;
 
     *)
diff --git a/etc/tilelite.wsgi b/etc/tilelite.wsgi
index de85f40..dad497d 100644
--- a/etc/tilelite.wsgi
+++ b/etc/tilelite.wsgi
@@ -1,5 +1,5 @@
 from tilelite import Server
 
-application = Server('/usr/share/openstreetmap-carto/style-osm-tile-server.xml')
+application = Server('/var/lib/osm-tile-server-base/tilesets/default/style.xml')
 dir(application)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git