Merge pull request #80 from rbuch703/apache2.4-fix

- changes to the Debian package for compatibility with Apache 2.4
This commit is contained in:
apmon
2014-07-09 13:00:09 -06:00
5 changed files with 8 additions and 7 deletions

4
debian/control vendored
View File

@ -2,12 +2,12 @@ Source: libapache2-mod-tile
Section: utils
Priority: optional
Maintainer: Frederik Ramm <frederik@remote.org>
Build-Depends: debhelper (>= 7), apache2-prefork-dev (>= 2.2.3) | apache2-threaded-dev (>= 2.2.3), libmapnik-dev | libmapnik2-dev, autoconf, automake, m4, libtool
Build-Depends: debhelper (>= 7), apache2-dev (>= 2.4.0), libmapnik-dev | libmapnik2-dev, autoconf, automake, m4, libtool
Standards-Version: 3.9.3
Package: libapache2-mod-tile
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, renderd | tirex-master, apache2.2-common, apache2-mpm-prefork | apache2-mpm-worker
Depends: ${shlibs:Depends}, ${misc:Depends}, renderd | tirex-master, apache2
Suggests: renderd
Description: Apache module to deliver tiles created by renderd
This Apache module receives map tiles requests and satisfies them from

View File

@ -1,6 +1,7 @@
debian/tile.load /etc/apache2/mods-available
debian/tileserver_site /etc/apache2/sites-available/
debian/tileserver_site.conf /etc/apache2/sites-available/
readme.txt /usr/share/doc/libapache2-mod-tile
munin/mod_tile* /usr/share/munin/plugins
openstreetmap-tiles-update-expire /usr/bin/
osmosis-db_replag /usr/bin
slippymap.html /var/www/osm

View File

@ -16,7 +16,7 @@ if [ "$1" = configure ] ; then
db_stop
if [ "x$ENABLE_SITE" = "xtrue" ] ; then
a2ensite tileserver_site
a2dissite default
a2dissite 000-default
fi
fi

View File

@ -3,9 +3,9 @@ set -e
if [ "$1" = remove ] ; then
a2dissite tileserver_site || true
a2ensite default || true
a2dismod -q -f tile || true
invoke-rc.d apache2 restart || true
a2ensite 000-default || true
a2dismod -q -f tile || true
invoke-rc.d apache2 restart || true
fi
# automatically remove munin plugins