[pkg-kolab] r1084 - kolabd/branches/2.2.1/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-17 16:21:59 +0000 (Wed, 17 Dec 2008)
New Revision: 1084

Added:
   kolabd/branches/2.2.1/debian/links
   kolabd/branches/2.2.1/debian/prerm
Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/dirs
   kolabd/branches/2.2.1/debian/postinst
   kolabd/branches/2.2.1/debian/rules
Log:
taken from kolab-freebusy:
    - apache.conf
    - prerm and postinst scripts
    - freebusy cache directory



Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-17 16:07:18 UTC (rev 1083)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-17 16:21:59 UTC (rev 1084)
@@ -24,9 +24,12 @@
     - replaces kolab-{freebusy,filter} by php-kolab-{freebusy,filter} in
       depends 
     - suggests clamav, clamav-daemon, spamassassin 
-  * taken apache.conf from kolab-freebusy 
+  * taken from kolab-freebusy:
+    - apache.conf
+    - prerm and postinst scripts
+    - freebusy cache directory 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 16:59:00 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 17:19:24 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/dirs
===================================================================
--- kolabd/branches/2.2.1/debian/dirs	2008-12-17 16:07:18 UTC (rev 1083)
+++ kolabd/branches/2.2.1/debian/dirs	2008-12-17 16:21:59 UTC (rev 1084)
@@ -1,4 +1,5 @@
 var/lib/kolab
+var/lib/kolab/freebusy-cache
 var/backups/kolab
 etc/kolab/filter
 etc/kolab/freebusy

Added: kolabd/branches/2.2.1/debian/links
===================================================================
--- kolabd/branches/2.2.1/debian/links	                        (rev 0)
+++ kolabd/branches/2.2.1/debian/links	2008-12-17 16:21:59 UTC (rev 1084)
@@ -0,0 +1 @@
+etc/kolab/apache.conf etc/apache2/sites-available/kolab

Modified: kolabd/branches/2.2.1/debian/postinst
===================================================================
--- kolabd/branches/2.2.1/debian/postinst	2008-12-17 16:07:18 UTC (rev 1083)
+++ kolabd/branches/2.2.1/debian/postinst	2008-12-17 16:21:59 UTC (rev 1084)
@@ -23,13 +23,38 @@
 fixperms() {
 	chown kolab:kolab /var/lib/kolab
 	chmod 2775 /var/lib/kolab
+	
+	chmod 750 /var/lib/kolab/freebusy-cache/
+	chown www-data:root /var/lib/kolab/freebusy-cache/
 }
 
+configure_apache() {
+	#a2enmod and a2ensite are in same package apache*-common
+	if command -v a2enmod >/dev/null 2>&1; then
+		for mod in rewrite ssl ldap; do
+			a2enmod $mod >/dev/null
+		done
+
+		if [ -e /etc/apache2/mods-available/php5.load ]; then
+			a2enmod php5 >/dev/null
+		fi
+
+		a2ensite kolab >/dev/null
+	fi
+
+	if command -v invoke-rc.d >/dev/null 2>&1; then
+		invoke-rc.d apache2 force-reload || :
+	else
+		[ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
+	fi
+}
+
 if [ "$1" = configure ]; then
 	add_kolab_system_users
 	adduser_postfix_in_sasl
 	adduser_cyrus_in_kolab
 	fixperms
+	configure_apache
 fi
 
 #DEBHELPER#

Added: kolabd/branches/2.2.1/debian/prerm
===================================================================
--- kolabd/branches/2.2.1/debian/prerm	                        (rev 0)
+++ kolabd/branches/2.2.1/debian/prerm	2008-12-17 16:21:59 UTC (rev 1084)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if command -v a2dissite >/dev/null 2>&1; then
+  a2dissite kolab >/dev/null
+else
+  rm -f /etc/apache2/sites-enabled/kolab
+fi
+
+#DEBHELPER#

Modified: kolabd/branches/2.2.1/debian/rules
===================================================================
--- kolabd/branches/2.2.1/debian/rules	2008-12-17 16:07:18 UTC (rev 1083)
+++ kolabd/branches/2.2.1/debian/rules	2008-12-17 16:21:59 UTC (rev 1084)
@@ -49,7 +49,7 @@
 	install -D -m 644 kolab2.schema debian/kolabd/etc/ldap/schema/kolab2.schema
 
 	#apache config
-	install -D -m 644 debian/apache.conf debian/kolab-freebusy/etc/kolab/apache.conf
+	install -D -m 644 debian/apache.conf debian/kolabd/etc/kolab/apache.conf
 
 #	# Commented out because of copyright issues, needs further investigation
 #	install -D -m 644 rfc2739.schema debian/kolabd/usr/share/kolabd/schema/rfc2739.schema