steffen: server/kolab/kolab cyrus.conf.template, 1.4, 1.5 imapd.conf.template, 1.9, 1.10 main.cf.template, 1.12, 1.13 master.cf.template, 1.4, 1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv19659/kolab

Modified Files:
	cyrus.conf.template imapd.conf.template main.cf.template 
	master.cf.template 
Log Message:
preparation for new features

Index: cyrus.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/cyrus.conf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cyrus.conf.template	31 Mar 2004 13:23:12 -0000	1.4
+++ cyrus.conf.template	7 Jun 2004 10:00:58 -0000	1.5
@@ -14,6 +14,9 @@
 
   # this is only necessary if using idled for IMAP IDLE
   #idled		cmd="idled"
+
+  # Initial mupdate syncronisation
+  #mupdatepush   cmd="ctl_mboxlist -m"
 }
 
 # UNIX sockets start with a slash and are put into /openpkg/var/imapd/sockets
@@ -23,6 +26,10 @@
   @@@cyrus-pop3@@@
   @@@cyrus-pop3s@@@
   @@@cyrus-sieve@@@
+
+#@@@if is-master@@@
+#  mupdate       cmd="mupdate -m" listen=3905 prefork=1
+#@@@endif@@@
 
   # LMTP is required for delivery
   lmtpunix	cmd="lmtpd" listen="@l_prefix@/var/kolab/lmtp" prefork=0

Index: imapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/imapd.conf.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imapd.conf.template	18 Apr 2004 02:51:41 -0000	1.9
+++ imapd.conf.template	7 Jun 2004 10:00:58 -0000	1.10
@@ -37,3 +37,9 @@
 virtdomains:            yes
 
 loginrealms:		@@@postfix-mydomain@@@
+
+## Murder slave setup
+#mupdate_server:         XXX
+#mupdate_port:           3905
+#mupdate_authname:       manager
+#mupdate_password:       @@@bind_pw@@@

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/main.cf.template,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- main.cf.template	25 May 2004 00:19:19 -0000	1.12
+++ main.cf.template	7 Jun 2004 10:00:58 -0000	1.13
@@ -1,3 +1,4 @@
+# (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
@@ -101,7 +102,16 @@
 #smtp_tls_session_cache_timeout = 3600s
 
 #   authentication via sasl
+
+## Kolab Policy Server (disabled for now)
+#smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,reject_unauth_destination,
+#	          check_policy_service unix:private/kolabpolicy
+#smtpd_sender_restrictions = check_policy_service unix:private/kolabpolicy
+#kolabpolicy_time_limit = 3600
+
 smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,reject_unauth_destination
+
+
 #smtpd_restriction_classes =
 smtpd_sasl_auth_enable = yes
 smtpd_sasl_local_domain = $myhostname

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/master.cf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- master.cf.template	31 Mar 2004 13:23:12 -0000	1.4
+++ master.cf.template	7 Jun 2004 10:00:58 -0000	1.5
@@ -1,3 +1,4 @@
+# (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
@@ -30,11 +31,11 @@
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=/kolab/bin/bsmtp -f $sender $nexthop $recipient
 465       inet  n       -       n       -       -       smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
 #587       inet  n       -       n       -       -       smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+kolabpolicy    unix  -       n       n       -       -       spawn user=@l_nusr@ argv=@l_prefix@/etc/kolab/kolab_smtpdpolicy -v -ldap @@@ldap_uri@@@ -base @@@user_dn_list@@@
 smtp-amavis unix -	-	n	-	2  smtp
     -o smtp_data_done_timeout=1200
     -o smtp_send_xforward_command=yes
     -o disable_dns_lookups=yes
-
 127.0.0.1:10025 inet n	-	n	-	-  smtpd
     -o content_filter=
     -o local_recipient_maps=