gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.11, 1.12
cvs at kolab.org
cvs at kolab.org
Tue Nov 27 08:30:27 CET 2007
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv5494/kolabd/kolabd/templates
Modified Files:
resmgr.conf.template.in
Log Message:
Continued fixing of kolab-filter.
Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- resmgr.conf.template.in 8 Oct 2007 15:50:11 -0000 1.11
+++ resmgr.conf.template.in 27 Nov 2007 07:30:25 -0000 1.12
@@ -39,110 +39,129 @@
*
*/
-// What is the address of the Cyrus server where the calendar data is stored?
-$params['server'] = '@@@connect_addr@@@';
+$conf = array();
-// Local IP address of the mailserver for bypassing content filters
-$params['local_addr'] = '@@@local_addr@@@';
+/* Cyrus server connection string */
+$conf['filter']['imap_server'] = '@@@connect_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.
-$params['email_domain'] = '@@@postfix-mydomain@@@';
+/* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
+$conf['filter']['lmpt_host'] = $conf['filter']['imap_server'];
+$conf['filter']['lmpt_port'] = 2003;
-// List of kolab hosts that are privileged
-$params['kolabhosts'] = '@@@kolabhost|join(,)@@@';
+/* SMTP settings (Kolab Postfix usually offers reinjection port on
+ * 10025)
+ */
+$conf['filter']['smpt_host'] = '@@@local_addr@@@';
+$conf['filter']['smpt_port'] = 10025;
-// Are we using virtual domains with Cyrus?
-$params['virtual_domains'] = true;
+/* Local IP address of the mailserver for bypassing content filters */
+$conf['filter']['local_addr'] = '@@@local_addr@@@';
-// Should we append domains to mailbox URIs? This only applies when
-// virtual_domains is true, and when using manager accounts.
-$params['append_domains'] = false;
+/* 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@@@';
-// Should we make sure that the sender and From header match for mail
-// that origins on this server?
+/* List of kolab hosts that are privileged */
+$conf['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';
+
+/* Are we using virtual domains with Cyrus? */
+$conf['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;
+
+/* Should we make sure that the sender and From header match for mail
+ * that origins on this server?
+ */
@@@if kolabfilter-verify-from-header@@@
$params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
@@@else@@@
$params['verify_from_header'] = false;
@@@endif@@@
-// Should we perform this check on mail from our
-// subdomains too?
-$params['verify_subdomains'] = true;
+/* Should we perform this check on mail from our
+ * subdomains too?
+ */
+$conf['filter']['verify_subdomains'] = true;
-// Should the Sender: header be used over From: if present?
+/* Should the Sender: header be used over From: if present? */
@@@if kolabfilter-allow-sender-header@@@
$params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
@@@else@@@
$params['allow_sender_header'] = false;
@@@endif@@@
-// Should reject messages with From headers that dont match
-// the envelope? Default is to rewrite the header
+/* Should reject messages with From headers that dont match
+ * the envelope? Default is to rewrite the header
+ */
@@@if kolabfilter-reject-forged-from-header@@@
$params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
@@@else@@@
$params['reject_forged_from_header'] = false;
@@@endif@@@
-// Text to be inserted in From: when rewriting untrusted mails
-$params['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-$params['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
-
-// Should we allow forwarded ical messages from Outlook
-// by encapsulating them in a MIME multipart
-$params['allow_outlook_ical_forward'] = true;
+/* 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)";
-// LDAP data
-// What is the address of the LDAP server address where user objects reside
-$params['ldap_uri'] = '@@@ldap_uri@@@';
+/* Should we allow forwarded ical messages from Outlook
+ * by encapsulating them in a MIME multipart
+ */
+$conf['filter']['allow_outlook_ical_forward'] = true;
-// What is the Base DN of our LDAP database?
-$params['base_dn'] = '@@@base_dn@@@';
+/* What is the address of the LDAP server address where user objects
+ * reside
+ */
+$conf['filter']['ldap_uri'] = '@@@ldap_uri@@@';
-// What DN should we use to bind to the LDAP server?
-$params['bind_dn'] = '@@@php_dn@@@';
+/* What is the Base DN of our LDAP database? */
+$conf['filter']['base_dn'] = '@@@base_dn@@@';
-// What password should we use with the above DN when binding?
-$params['bind_pw'] = '@@@php_pw@@@';
+/* What DN should we use to bind to the LDAP server? */
+$conf['filter']['bind_dn'] = '@@@php_dn@@@';
+/* What password should we use with the above DN when binding? */
+$conf['filter']['bind_pw'] = '@@@php_pw@@@';
-// What account should we use to read/write calendar data? This account should
-// have access to the calendar mailbox of all resource/group mailboxes.
-$params['calendar_user'] = 'calendar@'.$params['email_domain'];
-$params['calendar_pass'] = '@@@calendar_pw@@@';
+/* What account should we use to read/write calendar data? This
+ * account should have access to the calendar mailbox of all
+ * resource/group mailboxes.
+ */
+$conf['filter']['calendar_user'] = 'calendar@' . $conf['filter']['email_domain'];
+$conf['filter']['calendar_pass'] = '@@@calendar_pw@@@';
-// Filename of private key used to decrypt password from LDAP
-$params['priv_key_file'] = '@sysconfdir@/kolab/res_priv.pem';
+/* Filename of private key used to decrypt password from LDAP */
+$conf['filter']['priv_key_file'] = '@sysconfdir@/kolab/res_priv.pem';
-// 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)
-$params['calendar_store'] = 'Calendar';
+/* 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';
-// Where can we get free/busy information from?
-$params['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
+/* Where can we get free/busy information from? */
+$conf['filter']['freebusy_url'] = '@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
-// PFB url to trigger creation of pfb
-$params['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
-
-// Where are we logging to?
-$params['log'] = 'file:@resmgr_logfile@'; // File...
-// $params['log'] = 'syslog:cons, pid'; // Or syslog...
+/* PFB url to trigger creation of pfb */
+$conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
-// What level of output should we log? Higher levels give more verbose output.
-// One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
-$params['log_level'] = RM_LOG_DEBUG;
+/* Temporary data storage for the scripts */
+$conf['filter']['tempdir'] = '@resmgr_tmpdir@';
-// Temporary data storage for the script
-$params['resmgr_filterdir'] = '@resmgr_filterdir@';
+/* PHP error logging */
+$conf['filter']['error_log'] = '@resmgr_logdir@/php-error.log';
-// Activate if you wish to use the new horde framework
-// (horde-framework-kolab) package instead of the old code in
-// kolab-horde-framework. This is still untested and considered
-// UNSAFE!
-$params['use_new_horde'] = false;
+/* Horde::Log configuration */
+$conf['log']['enabled'] = true;
+$conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+$conf['log']['type'] = 'file';
+$conf['log']['name'] = '@resmgr_logdir@/filter.log';
+$conf['log']['ident'] = 'Kolab Filter';
+$conf['log']['params']['append'] = true;
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
More information about the commits
mailing list