gunnar: server/kolab-filter/filter config.php,1.4,1.5
cvs at kolab.org
cvs at kolab.org
Tue Nov 27 08:30:27 CET 2007
Author: gunnar
Update of /kolabrepository/server/kolab-filter/filter
In directory doto:/tmp/cvs-serv5494/kolab-filter/filter
Modified Files:
config.php
Log Message:
Continued fixing of kolab-filter.
Index: config.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/config.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.php 26 Nov 2007 16:35:21 -0000 1.4
+++ config.php 27 Nov 2007 07:30:24 -0000 1.5
@@ -36,22 +36,11 @@
$conf = array();
-/* 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'] = '/kolab/var/kolab-filter/log/filter.log';
-$conf['log']['ident'] = 'Kolab Filter';
-$conf['log']['params']['append'] = true;
-
-/* PHP error logging */
-$conf['filter']['error_log'] = '/kolab/var/kolab-filter/log/php-error.log';
-
-/* Temporary data storage for the scripts */
-$conf['filter']['tempdir'] = '';
+/* Cyrus server connection string */
+$conf['filter']['imap_server'] = 'localhost';
-/* What is the address of this host? */
-$conf['filter']['server'] = 'localhost';
+/* Local IP address of the mailserver for bypassing content filters */
+$conf['filter']['local_addr'] = 'localhost';
/* What is our default mail domain? This is used if any users do not
* have '@domain' specified after their username as part of their
@@ -59,102 +48,106 @@
*/
$conf['filter']['email_domain'] = 'example.com';
-/* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
-$conf['filter']['lmpt_host'] = 'localhost';
-$conf['filter']['lmpt_port'] = 2003;
+/* List of kolab hosts that are privileged */
+$conf['filter']['kolabhosts'] = 'one.example.com,two.example.com,three.example.com';
-/* SMTP settings (Kolab Postfix usually offers reinjection port on
- * 10025)
+/* 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']['smpt_host'] = 'localhost';
-$conf['filter']['smpt_port'] = 10025;
+$conf['filter']['append_domains'] = false;
/* Should we make sure that the sender and From header match for mail
* that origins on this server?
*/
$conf['filter']['verify_from_header'] = 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? */
$conf['filter']['allow_sender_header'] = true;
+/* Should reject messages with From headers that dont match
+ * the envelope? Default is to rewrite the header
+ */
+$conf['filter']['reject_forged_from_header'] = false;
+
+/* 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)";
+
/* 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 address of the LDAP server address where user objects
+ * reside
+ */
+$conf['filter']['ldap_uri'] = 'ldaps://ldap.example.com';
+/* What is the Base DN of our LDAP database? */
+$conf['filter']['base_dn'] = 'dc=example,dc=com';
-// List of kolab hosts that are privileged
-$conf['kolabhosts'] = 'one.example.com,two.example.com,three.example.com';
-
-// Are we using virtual domains with Cyrus?
-$conf['virtual_domains'] = true;
-
-// Should we append domains to mailbox URIs? This only applies when
-// virtual_domains is true, and when using manager accounts.
-$conf['append_domains'] = false;
-
-// Should we perform this check on mail from our
-// subdomains too?
-$conf['verify_subdomains'] = true;
-
-// Should reject messages with From headers that dont match
-// the envelope? Default is to rewrite the header
-$conf['reject_forged_from_header'] = false;
-
-// Text to be inserted in From: when rewriting untrusted mails
-$conf['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-$conf['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
-
-// LDAP data
-// What is the address of the LDAP server address where user objects reside
-$conf['ldap_uri'] = 'ldaps://ldap.example.com';
-
-// What is the Base DN of our LDAP database?
-$conf['base_dn'] = 'dc=example,dc=com';
+/* What DN should we use to bind to the LDAP server? */
+$conf['filter']['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
-// What DN should we use to bind to the LDAP server?
-$conf['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+/* What password should we use with the above DN when binding? */
+$conf['filter']['bind_pw'] = 'xyz';
-// What password should we use with the above DN when binding?
-$conf['bind_pw'] = 'xyz';
+/* 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'] = 'zyx';
+/* Filename of private key used to decrypt password from LDAP */
+$conf['filter']['priv_key_file'] = '@sysconfdir@/kolab/res_priv.pem';
-// 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['calendar_user'] = 'calendar@'.$conf['email_domain'];
-$conf['calendar_pass'] = 'zyx';
+/* 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';
-// Filename of private key used to decrypt password from LDAP
-$conf['priv_key_file'] = '@sysconfdir@/kolab/res_priv.pem';
+/* Where can we get free/busy information from? */
+$conf['filter']['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.xfb';
+
+/* PFB url to trigger creation of pfb */
+$conf['filter']['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
-// 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['calendar_store'] = 'Calendar';
+/* Temporary data storage for the scripts */
+$conf['filter']['tempdir'] = '';
-// Where can we get free/busy information from?
-$conf['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.xfb';
-
-// PFB url to trigger creation of pfb
-$conf['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+/* What is the address of this host? */
+$conf['filter']['server'] = 'localhost';
-// Where are we logging to?
-$conf['log'] = 'file:@resmgr_logfile@'; // File...
-// $conf['log'] = 'syslog:cons, pid'; // Or syslog...
+/* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
+$conf['filter']['lmpt_host'] = 'localhost';
+$conf['filter']['lmpt_port'] = 2003;
-// 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.
-$conf['log_level'] = RM_LOG_DEBUG;
+/* SMTP settings (Kolab Postfix usually offers reinjection port on
+ * 10025)
+ */
+$conf['filter']['smpt_host'] = 'localhost';
+$conf['filter']['smpt_port'] = 10025;
-// 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!
-$conf['use_new_horde'] = false;
+/* PHP error logging */
+$conf['filter']['error_log'] = '/kolab/var/kolab-filter/log/php-error.log';
-// FIXME: HACK
-$params = $conf;
+/* 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'] = '/kolab/var/kolab-filter/log/filter.log';
+$conf['log']['ident'] = 'Kolab Filter';
+$conf['log']['params']['append'] = true;
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
More information about the commits
mailing list