richard: server/kolabd/kolabd/templates main.cf.template.in, 1.7, 1.8 master.cf.template.in, 1.7, 1.8

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv26285/templates

Modified Files:
	main.cf.template.in master.cf.template.in 
Log Message:
introduced new variables for postfix emailserver_mail_owner,
emailserver_setgid_grp, emailserver_default_privs and emailserver_master_usr



Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- main.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
+++ main.cf.template.in	18 Jan 2006 19:43:11 -0000	1.8
@@ -25,9 +25,9 @@
 queue_directory = @emailserver_localstatedir@
 
 #   users
-mail_owner= @emailserver_musr@
-setgid_group= @emailserver_grp@
-default_privs= @emailserver_usr@
+mail_owner= @emailserver_mail_owner@
+setgid_group= @emailserver_setgid_grp@
+default_privs= @emailserver_default_privs@
 
 #   local host
 myhostname = @@@fqdnhostname@@@

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- master.cf.template.in	11 Jan 2006 14:40:41 -0000	1.7
+++ master.cf.template.in	18 Jan 2006 19:43:11 -0000	1.8
@@ -84,9 +84,9 @@
     -o smtpd_error_sleep_time=0
     -o smtpd_soft_error_limit=1001
     -o smtpd_hard_error_limit=1000
-kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_usr@ argv=@sysconfdir@/kolab/kolab_smtpdpolicy 
+kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@sysconfdir@/kolab/kolab_smtpdpolicy 
 
-kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_usr@ flags=n argv=@bindir@/php
+kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini
     -f @resmgr_confdir@/kolabfilter.php 
     --
@@ -96,7 +96,7 @@
     -c ${client_address}
     -u ${sasl_username}
 
-kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_usr@ flags=n argv=@bindir@/php
+kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
     -c @webserver_confdir@/php.ini
     -f @resmgr_confdir@/kolabmailboxfilter.php 
     --