[osm-tile-server] 31/117: Make copy of style.xml for osm-tile-server

[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 c3dcdf59453023c197db238d726f4fbadadd88de
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Sep 3 19:05:23 2015 +0200

    Make copy of style.xml for osm-tile-server
---
 debian/osm-tile-server-base.postinst    |  4 ++++
 debian/osm-tile-server-base.prerm       | 39 +++++++++++++++++++++++++++++++++
 debian/osm-tile-server-tilelite.init    |  2 +-
 debian/osm-tile-server-tilelite.service |  2 +-
 4 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/osm-tile-server-base.postinst b/debian/osm-tile-server-base.postinst
index b34138c..633c584 100644
--- a/debian/osm-tile-server-base.postinst
+++ b/debian/osm-tile-server-base.postinst
@@ -71,6 +71,10 @@ case "$1" in
             su postgres -c "cd /var/lib/postgresql ; psql -c \"CREATE EXTENSION postgis;\" -d $DBNAME"
             echo "DONE"
         fi
+
+        cp /usr/share/openstreetmap-carto/style.xml /usr/share/openstreetmap-carto/style-osm-tile-server.xml
+
+        sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\[test\]\]/' /usr/share/openstreetmap-carto/style-osm-tile-server.xml
    
         if [ "$IMPORTSAMPLE" = "true" ] ; then
             su $DBUSER -c "osm2pgsql --slim -d $DBNAME --cache-strategy sparse -C 100 --hstore -S /usr/share/osm2pgsql/default.style /usr/share/osm-tile-server-base/samples/liechtenstein-latest.osm.pbf"
diff --git a/debian/osm-tile-server-base.prerm b/debian/osm-tile-server-base.prerm
new file mode 100644
index 0000000..740d191
--- /dev/null
+++ b/debian/osm-tile-server-base.prerm
@@ -0,0 +1,39 @@
+#!/bin/sh
+# prerm script for bilder-ru
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+       rm -f /usr/share/openstreetmap-carto/style-osm-tile-server.xml 
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/osm-tile-server-tilelite.init b/debian/osm-tile-server-tilelite.init
index 90528e0..87c8ba9 100644
--- a/debian/osm-tile-server-tilelite.init
+++ b/debian/osm-tile-server-tilelite.init
@@ -25,7 +25,7 @@ RUNASUSER=""
 do_start(){
 
     echo "starting"
-    /bin/su $RUNASUSER -c "/usr/bin/screen -dmS tilelite /usr/bin/liteserv /usr/share/openstreetmap-carto/style.xml -c --cache-path=/var/cache/osm-tile-server-tilelite"
+    /bin/su $RUNASUSER -c "/usr/bin/screen -dmS tilelite /usr/bin/liteserv /usr/share/openstreetmap-carto/style-osm-tile-server.xml -c --cache-path=/var/cache/osm-tile-server-tilelite"
 
 }
 
diff --git a/debian/osm-tile-server-tilelite.service b/debian/osm-tile-server-tilelite.service
index a071f11..3841911 100644
--- a/debian/osm-tile-server-tilelite.service
+++ b/debian/osm-tile-server-tilelite.service
@@ -3,7 +3,7 @@ Description=TileLite server background process
 After=postgresql.service
 
 [Service]
-ExecStart=/usr/bin/screen -dmS tilelite /usr/bin/liteserv /usr/share/openstreetmap-carto/style.xml -c --cache-path=/var/cache/osm-tile-server-tilelite
+ExecStart=/usr/bin/screen -dmS tilelite /usr/bin/liteserv /usr/share/openstreetmap-carto/style-osm-tile-server.xml -c --cache-path=/var/cache/osm-tile-server-tilelite
 ExecStop=/usr/bin/screen -S tilelite -X quit
 User=$TILELITEUSER
 Type=forking

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