[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. fc27dba553cb0c1244ccfb1baba4041da16499c4

Stefan Fritsch sf at sfritsch.de
Thu Feb 16 01:43:38 UTC 2012 

The following commit has been merged in the next branch:
commit 864896ff7fc690c272683e95b1a42a31c853855a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Feb 16 02:01:43 2012 +0100

    mod_cache_disk has been renamed to mod_disk_cache

diff --git a/debian/README.Debian b/debian/README.Debian
index c4a5337..e9ec4ac 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,7 +5,7 @@ Contents
 		Files and Directories in /etc/apache2
 		Tools
 
-	Using mod_disk_cache
+	Using mod_cache_disk
 
 	SSL
 		Enabling SSL
@@ -150,16 +150,16 @@ for sites rather than modules.
 apxs2 -a/-A is modified to use a2enmod to activate newly installed modules.
 
 
-Using mod_disk_cache
+Using mod_cache_disk
 ====================
 
 To ensure that the disk cache does not grow indefinitely, htcacheclean is
-started when mod_disk_cache is enabled. Both daemon and cron (daily) mode
+started when mod_cache_disk is enabled. Both daemon and cron (daily) mode
 are supported. The configuration (run mode, cache size, ...) is in
 /etc/default/apache2 .
 
 Normally, htcacheclean is automatically started and stopped by
-/etc/init.d/apache2. However, if you change the state of mod_disk_cache or the
+/etc/init.d/apache2. However, if you change the state of mod_cache_disk or the
 configuration of htcacheclean while apache2 is running, you may need to
 manually start/stop htcacheclean with "/etc/init.d/apache2 start-htcacheclean"
 or "/etc/init.d/apache2 stop-htcacheclean".
diff --git a/debian/apache2.cron.daily b/debian/apache2.cron.daily
index a84c41b..cfd1fb9 100644
--- a/debian/apache2.cron.daily
+++ b/debian/apache2.cron.daily
@@ -13,7 +13,7 @@ set -u
 HTCACHECLEAN_MODE=daemon
 HTCACHECLEAN_RUN=auto
 HTCACHECLEAN_SIZE=300M
-HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
+HTCACHECLEAN_PATH=/var/cache/apache2/mod_cache_disk
 HTCACHECLEAN_OPTIONS=""
 
 . /etc/default/apache2
@@ -22,7 +22,7 @@ HTCACHECLEAN_OPTIONS=""
 
 [ "$HTCACHECLEAN_RUN" = "yes"	] || 
 ( [ "$HTCACHECLEAN_RUN" = "auto" ] && \
-  [ -e /etc/apache2/mods-enabled/disk_cache.load ] )  || exit 0
+  [ -e /etc/apache2/mods-enabled/cache_disk.load ] )  || exit 0
 
 /usr/sbin/htcacheclean  ${HTCACHECLEAN_OPTIONS}	\
 			-p${HTCACHECLEAN_PATH}	\
diff --git a/debian/apache2.default b/debian/apache2.default
index ffabf86..020f079 100644
--- a/debian/apache2.default
+++ b/debian/apache2.default
@@ -1,7 +1,7 @@
 ### htcacheclean settings ###
 
 ## run htcacheclean: yes, no, auto
-## auto means run if /etc/apache2/mods-enabled/disk_cache.load exists
+## auto means run if /etc/apache2/mods-enabled/cache_disk.load exists
 ## default: auto
 HTCACHECLEAN_RUN=auto
 
@@ -18,7 +18,7 @@ HTCACHECLEAN_DAEMON_INTERVAL=120
 
 ## path to cache
 ## must be the same as in CacheRoot directive
-HTCACHECLEAN_PATH=/var/cache/apache2/mod_disk_cache
+HTCACHECLEAN_PATH=/var/cache/apache2/mod_cache_disk
 
 ## additional options:
 ## -n : be nice
diff --git a/debian/apache2.dirs b/debian/apache2.dirs
index 1e1dd45..c3f300a 100644
--- a/debian/apache2.dirs
+++ b/debian/apache2.dirs
@@ -8,7 +8,7 @@ usr/share/apache2/build
 usr/share/apache2/default-site
 usr/share/lintian/overrides
 var/cache/apache2
-var/cache/apache2/mod_disk_cache
+var/cache/apache2/mod_cache_disk
 var/log/apache2
 var/www
 usr/share/bug/apache2
diff --git a/debian/apache2.init b/debian/apache2.init
index 2a53c49..d31677f 100644
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -45,7 +45,7 @@ HTCACHECLEAN_RUN=auto
 HTCACHECLEAN_MODE=daemon
 HTCACHECLEAN_SIZE=300M
 HTCACHECLEAN_DAEMON_INTERVAL=120
-HTCACHECLEAN_PATH=/var/cache/apache2$DIR_SUFFIX/mod_disk_cache
+HTCACHECLEAN_PATH=/var/cache/apache2$DIR_SUFFIX/mod_cache_disk
 HTCACHECLEAN_OPTIONS=""
 
 APACHE_HTTPD=$(. $APACHE_ENVVARS && echo $APACHE_HTTPD)
@@ -84,7 +84,7 @@ check_htcacheclean() {
 
 	MODSDIR=$(. $APACHE_ENVVARS && echo $APACHE_MODS_ENABLED)
 	[ "$HTCACHECLEAN_RUN"  = "auto" \
-	  -a -e ${MODSDIR:-$APACHE_CONFDIR/mods-enabled}/disk_cache.load ] && \
+	  -a -e ${MODSDIR:-$APACHE_CONFDIR/mods-enabled}/cache_disk.load ] && \
 		return 0
 	
 	return 1
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 32b674e..971da10 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -105,6 +105,14 @@ refresh_modules()
 			if [ -z $target ] ; then
 				continue
 			fi
+			case "$target" in
+			*/disk_cache.load)
+				a2dismod -q disk_cache
+				a2enmod -q cache_disk
+				# XXX: Handle rename of conf file
+				continue
+				;;
+			esac
 
 			module=$(basename "$link" | sed 's/\.load//') || true
 
@@ -124,6 +132,8 @@ refresh_modules()
 	fi
 }
 
+#XXX: Move /var/cache/apache2/mod_disk_cache to /var/cache/apache2/mod_cache_disk?
+
 
 #DEBHELPER#
 
diff --git a/debian/config-dir/old-mods-available/disk_cache.conf b/debian/config-dir/mods-available/cache_disk.conf
similarity index 86%
rename from debian/config-dir/old-mods-available/disk_cache.conf
rename to debian/config-dir/mods-available/cache_disk.conf
index 01414dc..ce5b1e5 100644
--- a/debian/config-dir/old-mods-available/disk_cache.conf
+++ b/debian/config-dir/mods-available/cache_disk.conf
@@ -1,4 +1,4 @@
-<IfModule mod_disk_cache.c>
+<IfModule mod_cache_disk.c>
 # cache cleaning is done by htcacheclean, which can be configured in
 # /etc/default/apache2
 #
@@ -7,7 +7,7 @@
 # man page.
 
 	# This path must be the same as the one in /etc/default/apache2
-        CacheRoot /var/cache/apache2/mod_disk_cache
+        CacheRoot /var/cache/apache2/mod_cache_disk
 
 	# This will also cache local documents. It usually makes more sense to
 	# put this into the configuration for just one virtual host.
diff --git a/debian/config-dir/old-mods-available/disk_cache.load b/debian/config-dir/old-mods-available/disk_cache.load
deleted file mode 100644
index 6bc1306..0000000
--- a/debian/config-dir/old-mods-available/disk_cache.load
+++ /dev/null
@@ -1,2 +0,0 @@
-# Depends: cache
-LoadModule disk_cache_module /usr/lib/apache2/modules/mod_disk_cache.so
diff --git a/debian/old-apache2.2-common.postrm b/debian/old-apache2.2-common.postrm
index 25d50d1..fb4a853 100644
--- a/debian/old-apache2.2-common.postrm
+++ b/debian/old-apache2.2-common.postrm
@@ -33,7 +33,7 @@ if [ "$1" = purge -a "$DONT_PURGE" != 1 ] ; then
 		/var/log/apache2/error.log*
 	
 	rm -rf 	/var/cache/apache2/proxy \
-		/var/cache/apache2/mod_disk_cache \
+		/var/cache/apache2/mod_cache_disk \
 		/var/run/apache2 \
 		/var/lock/apache2
 

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)

More information about the Pkg-apache-commits mailing list