[pkg-kolab] r634 - kolabd/trunk/debian/patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-06-23 00:41:38 +0000 (Sat, 23 Jun 2007)
New Revision: 634

Modified:
   kolabd/trunk/debian/patches/10-dist_conf.dpatch
Log:
Adjust some permissions in templates.


Modified: kolabd/trunk/debian/patches/10-dist_conf.dpatch
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.dpatch	2007-06-23 00:41:19 UTC (rev 633)
+++ kolabd/trunk/debian/patches/10-dist_conf.dpatch	2007-06-23 00:41:38 UTC (rev 634)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.721977849797444~/dist_conf/debian kolabd-2.1.0-20070510.dfsg.obsolete.0.721977849797444/dist_conf/debian
---- kolabd-2.1.0-20070510.dfsg.obsolete.0.721977849797444~/dist_conf/debian	2006-03-09 22:52:02.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg.obsolete.0.721977849797444/dist_conf/debian	2007-06-22 19:37:02.000000000 +0200
+diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.676933227413432~/dist_conf/debian kolabd-2.1.0-20070510.dfsg.obsolete.0.676933227413432/dist_conf/debian
+--- kolabd-2.1.0-20070510.dfsg.obsolete.0.676933227413432~/dist_conf/debian	2006-03-09 22:52:02.000000000 +0100
++++ kolabd-2.1.0-20070510.dfsg.obsolete.0.676933227413432/dist_conf/debian	2007-06-23 02:33:10.000000000 +0200
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -46,7 +46,20 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -82,21 +83,21 @@
+@@ -52,9 +53,10 @@
+ emailserver_socket=${libdir}/postfix/lmtp
+ emailserver_localstatedir=${localstatedir}/spool/postfix
+ emailserver_logfile=${localstatedir}/log/mail.log
+-emailserver_usr=${kolab_usr}
++emailserver_usr=root
++emailserver_tables_usr=root
+ emailserver_musr=kolab
+-emailserver_grp=${restricted_kolab_grp}
++emailserver_grp=root
+ 
+ ftpserver_scoreboardfile=${localstatedir}/proftpd/score
+ ftpserver_logfile=${localstatedir}/log/proftpd.log
+@@ -82,21 +84,21 @@
  kolab_logdir=${localstatedir}/log/kolab
  kolab_pidfile=${sysrundir}/kolab.pid
  kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
@@ -77,7 +90,16 @@
  
  webserver_document_root=/var/www
  webserver_cgidir=${webserver_document_root}/cgi-bin
-@@ -121,16 +122,16 @@
+@@ -114,28 +116,36 @@
+ webserver_sslmutex=${sysrundir}/ssl_mutex
+ webserver_web_prefix=/kolab
+ webserver_musr=kolab
+-webserver_usr=wwwrun
+-webserver_grp=www
++webserver_usr=www-data
++webserver_grp=www-data
+ 
+ phplibdir=${datadir}/php
  phplibdir2=${datadir}/php
  phppeardir=${phplibdir}/PEAR
  
@@ -92,14 +114,23 @@
 +resmgr_confdir=${sysconfdir}/kolab
  resmgr_filterdir=${localstatedir}/resmgr/filter
  resmgr_scriptsdir=${resmgr_confdir}
- resmgr_usr=kolab
+-resmgr_usr=kolab
 -resmgr_grp=kolab-n
-+resmgr_grp=kolab
++resmgr_conffile_usr=root
++resmgr_conffile_grp=www-data
++resmgr_usr=root
++resmgr_grp=www-data
  
  fbview_logfile=${localstatedir}/resmgr/fbview.log
  freebusy_logfile=${localstatedir}/resmgr/freebusy.log
-@@ -139,3 +140,4 @@
+ freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
++freebusy_usr=root
++freebusy_grp=www-data
+ 
  graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
  graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
  
 +backupdir=${localstatedir}/backups/kolab
++
++kolab_smtpdpolicy_conffile_usr=${kolab_musr}
++kolab_smtpdpolicy_conffile_grp=${kolab_grp}