[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.1debian-2-1-gd45bed9

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit d45bed94aec69c85547a71b8481e3f37ed16f284
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sun Jun 10 21:13:38 2012 +0200

    Check whether a2enmod and apache2ctl are available (as apache2 need not be installed)

diff --git a/debian/TODO b/debian/TODO
index b0280e7..3e548f3 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -8,10 +8,11 @@ ownCloud packaging TODO list
   the standard data directory at least).
 * Set up logging somehow, the configuration has parameters for it.  If we
   enable it, also add log rotation.
-* Figure out what happens if backups are enabled.  Should it work? What
+* Figure out what happens if backups are enabled.  Should it work?  What
   does it do?
 * Update the integration with Apache 2.4 once it hits unstable, see also:
   http://wiki.debian.org/Apache/PackagingFor24.
+* Support other httpds that are also supported by owncloud.
 * collabtive and owncloud both ship class.openid.php, it should probably be
   packaged separately
 * lib/MDB2/Driver contains the MDB2 SQLite3 driver that should be released
diff --git a/debian/changelog b/debian/changelog
index 6f99afc..5a9034f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+owncloud (4.0.1debian-3) UNRELEASED; urgency=low
+
+  * debian/postinst: check whether a2enmod and apache2ctl are available
+    (as apache2 need not be installed).
+
+ -- Paul van Tilburg <paulvt at debian.org>  Sun, 10 Jun 2012 21:08:16 +0200
+
 owncloud (4.0.1debian-2) unstable; urgency=low
 
   * Upload to fix PostgreSQL-related install issues.
diff --git a/debian/postinst b/debian/postinst
index 79163dc..f8d7597 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -33,11 +33,14 @@ reload_apache()
 
 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
+        # Test whether a2enmod is available (and thus also apache2ctl).
+        if [ -x /usr/sbin/a2enmod ]; then
+            # 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
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

-- 
owncloud.git