[mod_tile] Update debian build scripts

debian/changelog

@@ -1,9 +1,16 @@
-libapache2-mod-tile (0.4) natty; urgency=low
+libapache2-mod-tile (0.4-9~oneiric1) oneiric; urgency=low
+
+  * added a slippymap
+  * added scripts to update a tileserver
+
+ -- Kai Krueger <kakrueger@gmail.com>  Sun, 09 Oct 2011 00:00:00 +0000
+
+libapache2-mod-tile (0.4-8~natty1) natty; urgency=low
 
   * new upstream version
   * fixed debian package scripts
 
- -- Kai Krueger <kakrueger@gmail.com>  Tue, 20 Sep 2011 00:00:00 +0000
+ -- Kai Krueger <kakrueger@gmail.com>  Thu, 06 Oct 2011 00:00:00 +0000
 
 libapache2-mod-tile (0.3) jaunty; urgency=low
 

debian/control

@@ -2,7 +2,7 @@ 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, dpatch
+Build-Depends: debhelper (>= 7), apache2-prefork-dev (>= 2.2.3) | apache2-threaded-dev (>= 2.2.3), libmapnik-dev | libmanik2-dev, dpatch
 Standards-Version: 3.9.2
 
 Package: libapache2-mod-tile
@@ -15,9 +15,10 @@ Description: Apache module to deliver tiles created by renderd
 
 Package: renderd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmapnik0.7
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmapnik0.7 | libmapnik2
 Suggests: libapache2-mod-tile
-Recommends: osm2pgsql
+Recommends: osm2pgsql, openstreetmap-mapnik-stylesheet-data
 Description: Daemon that renders map tiles using mapnik
  This daemon creates "metatiles" for map tile requests issued by mod_tile
  using the mapnik library.
+

debian/copyright

@@ -1,4 +1,58 @@
+Format: http://dep.debian.net/deps/dep5
+Source: http://svn.openstreetmap.org/applications/utils/mod_tile/
+
+Copyright: © 2007 - 2011, Jon Burgess
+Copyright: © 2009 - 2011, Kai Krueger
+Copyright: © 2009 - 2011, Frederik Ramm
+Copyright: © 2008 - 2010, Tom Hughes
+Copyright: ©        2011, Stephan Knauss 
+Copyright: ©        2010, Lennard voor den Dag 
+Copyright: ©        2010, Dane Springmeyer 
+Copyright: ©        2010, Andreas Hubel 
+Copyright: ©        2010, Brian Quinion 
+Copyright: ©        2009, Ævar Arnfjörð Bjarmason 
+Copyright: ©        2009, Jochen Topf
+
+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Comments:
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 or later can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: other
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without a written agreement
+ is hereby granted, provided that the above copyright notice and this
+ paragraph and the following two paragraphs appear in all copies.
+ .
+ IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+ LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+ DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
 Licensed under GPL v2 or later
 The full license text can be found at /usr/share/common-licenses/GPL-2
 Copyright 2007-2001 various authors, as per http://svn.openstreetmap.org/applications/utils/mod_tile/
 
+

debian/libapache2-mod-tile.config

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input high libapache2-mod-tile/enablesite || true
+db_go || true
+
+cat <<EOF > /etc/default/libapache2-mod-tile
+# Default settings for openstreetmap-mapnik-data
+INIT_DB="$INIT_DB"
+GRANT_USER="$GRANT_USER"
+EOF
+

debian/libapache2-mod-tile.dirs

@@ -0,0 +1 @@
+/var/www/osm/

debian/libapache2-mod-tile.install

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

debian/libapache2-mod-tile.postinst

@@ -1,31 +1,44 @@
 #!/bin/sh
 set -e
 
-mkdir -p /var/lib/mod_tile
-chown www-data:www-data /var/lib/mod_tile
-
 if [ "$1" = configure ] ; then
+
+    . /usr/share/debconf/confmodule
+
+    mkdir -p /var/lib/mod_tile
+    chown www-data:www-data /var/lib/mod_tile
+
        # only enable on new installs, not on upgrades
-	if [ -z "$2" ] ; then
+    if [ -z "$2" ] ; then
-		a2enmod tile
+	    a2enmod tile
-	fi
+        db_get libapache2-mod-tile/enablesite || true
+        ENABLE_SITE=$RET
+        db_stop
+        if [ "x$ENABLE_SITE" = "xtrue" ] ; then
+            a2ensite tileserver_site
+            a2dissite default
+        fi
+    fi
+    
        # only restart if mod_something is enabled
 	if [ -e /etc/apache2/mods-enabled/tile.load ] ; then
 		invoke-rc.d apache2 restart
 	fi
-fi
+    
-
+    # automatically install munin plugins if munin is present.
-# automatically install munin plugins if munin is present.
+    if [ -d /etc/munin/plugins ] ; then
-if [ -d /etc/munin/plugins ]
+        cd /etc/munin/plugins
-then
+        for i in /usr/share/munin/plugins/mod_tile*
-    cd /etc/munin/plugins
+        do
-    for i in /usr/share/munin/plugins/mod_tile*
+            if [ ! -h `basename $i` ]
-    do
+            then
-        if [ ! -h `basename $i` ]
+                ln -s $i .
-        then
+            fi
-            ln -s $i .
+        done
-        fi
+    fi
-    done
+    true
 fi
 
 #DEBHELPER#
+
+exit 0

debian/libapache2-mod-tile.prerm

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

debian/libapache2-mod-tile.templates

@@ -0,0 +1,6 @@
+Template: libapache2-mod-tile/enablesite
+Type: boolean
+Default: true
+Description: Do you want to enable mod_tile in the apache config?
+ This will enable the apache config for mod_tile
+ WARNING: This will disable the currently active default site config

debian/renderd.postinst

@@ -3,6 +3,8 @@ set -e
 
 mkdir -p /var/lib/mod_tile
 chown www-data:www-data /var/lib/mod_tile
+chown www-data:www-data /usr/bin/renderd
+chmod u+s /usr/bin/renderd
 
 # automatically install munin plugins if munin is present.
 if [ -d /etc/munin/plugins ]

debian/rules

@@ -70,7 +70,7 @@ binary-arch: build install
 	dh_installexamples
 	dh_install
 #	dh_installmenu
-#	dh_installdebconf	
+	dh_installdebconf	
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam

debian/tileserver_site

@@ -2,9 +2,11 @@
 # through mod_tile
 
 <VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+
     ServerName tile.mytileserver.org
-    ServerAlias a.tile.mytileserver.org btile.mytileserver.org c.tile.mytileserver.org
+    ServerAlias a.tile.mytileserver.org b.tile.mytileserver.org c.tile.mytileserver.org
-    DocumentRoot /var/www/html
+    DocumentRoot /var/www
 
 	###
 	###    
@@ -110,5 +112,37 @@ ModTileThrottlingTiles 10000 1
 ## Parameters (poolsize in tiles and topup rate in tiles per second) for throttling render requests. 
 ModTileThrottlingRenders 128 0.2
 
+        <Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+    Alias /doc/ "/usr/share/doc/"
+    <Directory "/usr/share/doc/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+    </Directory>
+
 </VirtualHost>