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 f4858bd5715a7fc1bc8bd68e26b375bbf038bf88
Author: Ruben Undheim <ruben.undh...@gmail.com>
Date: Mon Sep 7 19:41:27 2015 +0200
Run tilelite through apache and not standalone
---
debian/control | 3 +-
debian/osm-tile-server-tilelite.init | 59 --------------------------------
debian/osm-tile-server-tilelite.install | 1 +
debian/osm-tile-server-tilelite.postinst | 19 ++++++++--
debian/osm-tile-server-tilelite.prerm | 40 ++++++++++++++++++++++
debian/osm-tile-server-tilelite.service | 13 -------
6 files changed, 59 insertions(+), 76 deletions(-)
diff --git a/debian/control b/debian/control
index 183cd65..c5ea6c6 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Description: Common files for OSM tile server
Package: osm-tile-server-tilelite
Architecture: all
Depends: ${misc:Depends},
- osm-tile-server-base, tilelite, screen
+ osm-tile-server-base, tilelite,
+ apache2, libapache2-mod-wsgi
#Breaks: osm-tile-server-mod-tile
Description: This sets up a full OSM tile server using tilelite
To use tilelite as the tile server, install this
diff --git a/debian/osm-tile-server-tilelite.init
b/debian/osm-tile-server-tilelite.init
deleted file mode 100644
index 87c8ba9..0000000
--- a/debian/osm-tile-server-tilelite.init
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: osm-tile-server-tilelite
-# Required-Start: $remote_fs postgresql
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: <Enter a short description of the software>
-# Description: <Enter a long description of the software>
-# <...>
-# <...>
-### END INIT INFO
-
-# Author: ruben <ruben.undh...@gmail.com>
-
-
-DESC="OSM tile server using tilelite"
-NAME=osm-tile-server-tilelite
-
-RUNASUSER=""
-
-. /lib/lsb/init-functions
-
-
-do_start(){
-
- echo "starting"
- /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"
-
-}
-
-do_stop(){
-
- echo "stopping"
- /bin/su $RUNASUSER -c "/usr/bin/screen -S tilelite -X quit"
-
-}
-
-case "$1" in
- start)
- do_start
- ;;
- stop|graceful-stop)
- do_stop
- ;;
- status)
- ;;
- reload|force-reload|graceful)
- ;;
- restart)
- do_stop
- do_start
- ;;
-esac
-
-exit 0
-
-
-
diff --git a/debian/osm-tile-server-tilelite.install
b/debian/osm-tile-server-tilelite.install
new file mode 100644
index 0000000..e6e4fc0
--- /dev/null
+++ b/debian/osm-tile-server-tilelite.install
@@ -0,0 +1 @@
+etc/tilelite.wsgi usr/share/osm-tile-server-tilelite/wsgi/
diff --git a/debian/osm-tile-server-tilelite.postinst
b/debian/osm-tile-server-tilelite.postinst
index ae0d3f1..fe76a2a 100644
--- a/debian/osm-tile-server-tilelite.postinst
+++ b/debian/osm-tile-server-tilelite.postinst
@@ -22,14 +22,27 @@ set -e
case "$1" in
configure)
- #db_get osm-tile-server/db-user
DBUSER="osm-tile-server"
chown $DBUSER:$DBUSER /var/cache/osm-tile-server-tilelite
- sed -i 's/^User=.*$/User='${DBUSER}'/'
/lib/systemd/system/osm-tile-server-tilelite.service
- sed -i 's/^RUNASUSER=.*$/RUNASUSER="'${DBUSER}'"/'
/etc/init.d/osm-tile-server-tilelite
+ cat << EOF > /etc/apache2/sites-available/osm-tile-server-tilelite.conf
+<VirtualHost *:80>
+#ServerName tull.naturfakta.no
+WSGIScriptAlias / /usr/share/osm-tile-server-tilelite/wsgi/tilelite.wsgi
+WSGIDaemonProcess osm-tile-server-tilelite user=osm-tile-server
group=osm-tile-server processes=10 threads=1
+WSGIProcessGroup osm-tile-server-tilelite
+
+<Directory /usr/local>
+ AllowOverride None
+ Require all granted
+</Directory>
+
+</VirtualHost>
+EOF
+
+ a2ensite osm-tile-server-tilelite.conf
;;
diff --git a/debian/osm-tile-server-tilelite.prerm
b/debian/osm-tile-server-tilelite.prerm
new file mode 100644
index 0000000..e66f681
--- /dev/null
+++ b/debian/osm-tile-server-tilelite.prerm
@@ -0,0 +1,40 @@
+#!/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)
+ a2dissite osm-tile-server-tilelite.conf
+ rm -f /etc/apache2/sites-available/osm-tile-server-tilelite.conf
+ ;;
+
+ 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.service
b/debian/osm-tile-server-tilelite.service
deleted file mode 100644
index 3841911..0000000
--- a/debian/osm-tile-server-tilelite.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=TileLite server background process
-After=postgresql.service
-
-[Service]
-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
-
-
-[Install]
-WantedBy=multi-user.target
--
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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
