[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-71-g9cc8731

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 9cc8731b71b0390db130cfeb15249cca47220044
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat May 19 13:19:07 2012 +0200

    Updated debian/owncloud.postinst to load the rewrite module; updated TODO items.

diff --git a/debian/TODO b/debian/TODO
index b6071c2..4a2982a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,7 +4,6 @@ ownCloud packaging TODO list
 * Build pdf.js based on source contained and remove the source.
 * Solve copyright issues:
   - apps/user_openid/class.openid.v3.php - license known, but not the copyright!
-* Ensure mod_rewrite is enabled; it is used by .htaccess.
 * Write patch to prevent installation of 3rd-party apps via the internet, 
   because this is risky. Bad code can be injected.
 
@@ -13,6 +12,8 @@ Low priority/later
 
 * Use dbconfig integration to create a database user, database and
   configuration in /etc/owncloud. (Migrations are handled by ownCloud itself.)
+* Update the integration with Apache 2.4 once it hits unstable, see also:
+  http://wiki.debian.org/Apache/PackagingFor24.
 * collabtive and owncloud both ship class.openid.php, it should probably be
   packaged separately
 * Once php-getid3 has been brought up to date in Debian, use it as a
diff --git a/debian/changelog b/debian/changelog
index 0ba8d1a..3d35406 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ owncloud (4.0.0~rc-1) UNRELEASED; urgency=low
     - Added a depend on libphp-phpmailer.
     - Bumped the libjs-jquery depend to >= 1.7.2-1.
   * debian/copyright, debian/rules: updated for new upstream release.
+  * debian/owncloud.postinst: updated to enable Apache's rewrite module.
   * debian/patches:
     - Refreshed patches 01_fix_data_path.diff and 02_fix_crypt.diff for new
       upstream.
diff --git a/debian/postinst b/debian/postinst
index 6be64b0..79163dc 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -17,17 +17,27 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
-case "$1" in
-    configure)
-
-	# restart apache
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
 	if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d apache2 reload 3>/dev/null || true
+            invoke-rc.d apache2 $1 3>/dev/null || true
 	else
-            /etc/init.d/apache2 reload 3>/dev/null || true
+            /etc/init.d/apache2 $1 3>/dev/null || true
 	fi
+    else
+        echo "Your Apache 2 configuration is broken, so we're not restarting it for you."
+    fi
+}
 
+
+case "$1" in
+    configure)
+        # Enable the Apache2 rewrite module if not already enabled
+        a2enmod rewrite > /dev/null || true
+        # Restart Apache to really enable the module and load
+        # /etc/apache2/conf.d/owncloud.conf.
+        reload_apache restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

-- 
owncloud.git