steffen: server/kolabd/kolabd/templates kolab_smtpdpolicy.conf.template, NONE, 1.1.2.1 master.cf.template, 1.11.2.1, 1.11.2.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	master.cf.template 
Added Files:
      Tag: kolab_2_0_branch
	kolab_smtpdpolicy.conf.template 
Log Message:
new conf file for policy daemon. Fixes Issue832 for kolab 2.0

--- NEW FILE: kolab_smtpdpolicy.conf.template ---
# (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.

# this file is automatically written by the Kolab config backend
# manual additions are lost unless made to the template in the Kolab config directory

ldap_uri: @@@ldap_uri@@@
basedn: @@@user_dn_list@@@
binddn: @@@php_dn@@@
bindpw: @@@php_pw@@@
domain: @@@postfix-mydomain@@@
@@@if postfix-allow-unauthenticated@@@
allow_unauth: 1
@@@else@@@
allow_unauth: 0
@@@endif@@@
permithosts: @@@kolabhost|join,@@@

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/master.cf.template,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- master.cf.template	26 Jul 2005 01:37:57 -0000	1.11.2.1
+++ master.cf.template	16 Sep 2005 12:37:51 -0000	1.11.2.2
@@ -76,15 +76,6 @@
     -o smtpd_soft_error_limit=1001
     -o smtpd_hard_error_limit=1000
 kolabpolicy    unix  -       n       n       -       -       spawn user=@l_nusr@ argv=@l_prefix@/etc/kolab/kolab_smtpdpolicy 
-    -ldap @@@ldap_uri@@@ 
-    -basedn @@@user_dn_list@@@
-    -binddn @@@php_dn@@@
-    -bindpw @@@php_pw@@@
-    -domain @@@postfix-mydomain@@@
-@@@if postfix-allow-unauthenticated@@@
-    -allow-unauth
-@@@endif@@@
-    -permithosts @@@kolabhost|join,@@@
 
 kolabfilter     unix  -       n       n       -       -       pipe user=@l_nusr@ flags=n argv=@l_prefix@/bin/php
     -c @l_prefix@/etc/apache/php.ini