gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.26, 1.27

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Updated the configuration
template for the new Kolab_Filter version.

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- resmgr.conf.template.in	19 Sep 2008 14:06:59 -0000	1.26
+++ resmgr.conf.template.in	23 Sep 2008 13:47:51 -0000	1.27
@@ -44,85 +44,85 @@
 
 /* Cyrus server connection string */
 @@@if cyrus-imap@@@
-$conf['filter']['imap_server'] = '@@@connect_addr@@@';
+$conf['kolab']['filter']['imap_server'] = '@@@connect_addr@@@';
 @@@else@@@
-$conf['filter']['imap_server'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['imap_server'] = '@@@local_addr@@@';
 @@@endif@@@
 
 /* Local delivery backend (default LMTP) */
-$conf['filter']['delivery_backend'] = 'LMTP';
+$conf['kolab']['filter']['delivery_backend'] = 'LMTP';
 
 /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
-$conf['filter']['lmtp_host'] = '@@@local_addr@@@';
-$conf['filter']['lmtp_port'] = 2003;
+$conf['kolab']['filter']['lmtp_host'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['lmtp_port'] = 2003;
 
 /* SMTP settings (Kolab Postfix usually offers reinjection port on
  * 10025)
  */
-$conf['filter']['smtp_host'] = '@@@local_addr@@@';
-$conf['filter']['smtp_port'] = 10025;
+$conf['kolab']['filter']['smtp_host'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['smtp_port'] = 10025;
 
 /* Local IP address of the mailserver for bypassing content filters */
-$conf['filter']['local_addr'] = '@@@local_addr@@@';
+$conf['kolab']['filter']['local_addr'] = '@@@local_addr@@@';
 
 /* What is our default mail domain? This is used if any users do not
  * have '@domain' specified after their username as part of their
  * email address.
  */
-$conf['filter']['email_domain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['filter']['email_domain'] = '@@@postfix-mydomain@@@';
 
 /* List of kolab hosts that are privileged */
-$conf['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';
+$conf['kolab']['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';
 
 /* List privileged networks */
-$conf['filter']['privileged_networks'] = '@@@postfix-mynetworks|join(,)@@@';
+$conf['kolab']['filter']['privileged_networks'] = '@@@postfix-mynetworks|join(,)@@@';
 
 /* Are we using virtual domains with Cyrus? */
-$conf['filter']['virtual_domains'] = true;
+$conf['kolab']['filter']['virtual_domains'] = true;
 
 /* Should we append domains to mailbox URIs? This only applies when
  * virtual_domains is true, and when using manager accounts.
  */
-$conf['filter']['append_domains'] = false;
+$conf['kolab']['filter']['append_domains'] = false;
 
 /* Should we make sure that the sender and From header match for mail
  * that origins on this server?
  */
 @@@if kolabfilter-verify-from-header@@@
-$conf['filter']['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
+$conf['kolab']['filter']['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
 @@@else@@@
-$conf['filter']['verify_from_header'] = false;
+$conf['kolab']['filter']['verify_from_header'] = false;
 @@@endif@@@
 
 /* Should we perform this check on mail from our
  * subdomains too?
  */
-$conf['filter']['verify_subdomains'] = true;
+$conf['kolab']['filter']['verify_subdomains'] = true;
 
 /* Should the Sender: header be used over From: if present? */
 @@@if kolabfilter-allow-sender-header@@@
-$conf['filter']['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
+$conf['kolab']['filter']['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
 @@@else@@@
-$conf['filter']['allow_sender_header'] = false;
+$conf['kolab']['filter']['allow_sender_header'] = false;
 @@@endif@@@
 
 /* Should reject messages with From headers that dont match
  * the envelope? Default is to rewrite the header
  */
 @@@if kolabfilter-reject-forged-from-header@@@
-$conf['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+$conf['kolab']['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
 @@@else@@@
-$conf['filter']['reject_forged_from_header'] = false;
+$conf['kolab']['filter']['reject_forged_from_header'] = false;
 @@@endif@@@
 
 /* Text to be inserted in From: when rewriting untrusted mails */
-// $conf['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-// $conf['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+// $conf['kolab']['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
+// $conf['kolab']['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
 
 /* Should we allow forwarded ical messages from Outlook
  * by encapsulating them in a MIME multipart
  */
-$conf['filter']['allow_outlook_ical_forward']  = true;
+$conf['kolab']['filter']['allow_outlook_ical_forward']  = true;
 
 /* What is the address of the LDAP server address where user objects
  * reside
@@ -142,26 +142,26 @@
  * account should have access to the calendar mailbox of all
  * resource/group mailboxes.
  */
-$conf['filter']['calendar_id'] = '@@@calendar_id@@@';
-$conf['filter']['calendar_pass'] = '@@@calendar_pw@@@';
+$conf['kolab']['filter']['calendar_id'] = '@@@calendar_id@@@';
+$conf['kolab']['filter']['calendar_pass'] = '@@@calendar_pw@@@';
 
 /* What is the name of the users' calendar mailbox?  This is only used
  * when the user does not already have a primary calendar folder
  * (search via Kolab annotation)
  */
-$conf['filter']['calendar_store'] = 'Calendar';
+$conf['kolab']['filter']['calendar_store'] = 'Calendar';
 
 /* Where can we get free/busy information from? */
-$conf['filter']['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
+$conf['kolab']['filter']['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
  
 /* PFB url to trigger creation of pfb */
-$conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.pfb';
+$conf['kolab']['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.pfb';
 
 /* Temporary data storage for the scripts */
-$conf['filter']['tempdir'] = '@resmgr_tmpdir@';
+$conf['kolab']['filter']['tempdir'] = '@resmgr_tmpdir@';
 
 /* PHP error logging */
-$conf['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
+$conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
 
 /* Horde::Log configuration
  *