[pkg-kolab] r698 - in kolabd/trunk/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-10-19 11:47:24 +0000 (Fri, 19 Oct 2007)
New Revision: 698

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/10-dist_conf.dpatch
Log:
* Added emailserver_master_usr definition to dist_conf/debian (from Philip Hands)

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2007-10-19 11:40:19 UTC (rev 697)
+++ kolabd/trunk/debian/changelog	2007-10-19 11:47:24 UTC (rev 698)
@@ -5,6 +5,7 @@
   * Dropped Apache templates; configuration is currently provided by
     kolab-resource-handlers package
   * Added aliases_file definition to dist_conf/debian (from Philip Hands)
+  * Added emailserver_master_usr definition to dist_conf/debian (from Philip Hands)
   * Added Suggests of amavisd-new (from Philip Hands)
   * Replaced flags=n by null_sender= in postfix master.cf template (from Philip Hands)
 

Modified: kolabd/trunk/debian/patches/10-dist_conf.dpatch
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.dpatch	2007-10-19 11:40:19 UTC (rev 697)
+++ kolabd/trunk/debian/patches/10-dist_conf.dpatch	2007-10-19 11:47:24 UTC (rev 698)
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad kolabd-2.1.0-20070510.dfsg~/dist_conf/debian kolabd-2.1.0-20070510.dfsg/dist_conf/debian
 --- kolabd-2.1.0-20070510.dfsg~/dist_conf/debian	2006-03-09 22:52:02.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2007-10-19 12:45:49.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2007-10-19 13:43:26.000000000 +0200
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -46,7 +46,7 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -52,9 +53,10 @@
+@@ -52,9 +53,11 @@
  emailserver_socket=${libdir}/postfix/lmtp
  emailserver_localstatedir=${localstatedir}/spool/postfix
  emailserver_logfile=${localstatedir}/log/mail.log
@@ -56,10 +56,11 @@
  emailserver_musr=kolab
 -emailserver_grp=${restricted_kolab_grp}
 +emailserver_grp=root
++emailserver_master_usr=kolab
  
  ftpserver_scoreboardfile=${localstatedir}/proftpd/score
  ftpserver_logfile=${localstatedir}/log/proftpd.log
-@@ -69,34 +71,35 @@
+@@ -69,34 +72,35 @@
  
  imap_confdir=${sysconfdir}
  imap_confperm=0640
@@ -106,7 +107,7 @@
  
  webserver_document_root=/var/www
  webserver_cgidir=${webserver_document_root}/cgi-bin
-@@ -114,28 +117,39 @@
+@@ -114,28 +118,39 @@
  webserver_sslmutex=${sysrundir}/ssl_mutex
  webserver_web_prefix=/kolab
  webserver_musr=kolab