steffen: server/kolab/kolab/templates fbview.conf.template, NONE, 1.1 freebusy.conf.template, NONE, 1.1 imapd.replicas.template, NONE, 1.1 resmgr.conf.template, NONE, 1.1 httpd.conf.template, 1.1, 1.2 imapd.conf.template, 1.1, 1.2 main.cf.template, 1.1, 1.2 php.ini.template, 1.1, 1.2 session_vars.php.template, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Fri Jun 11 10:55:07 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv9640/kolab/templates
Modified Files:
httpd.conf.template imapd.conf.template main.cf.template
php.ini.template session_vars.php.template
Added Files:
fbview.conf.template freebusy.conf.template
imapd.replicas.template resmgr.conf.template
Log Message:
prepare for integration with group/resource/fbview/freebusy modules
--- NEW FILE: fbview.conf.template ---
<?php
// What is the address of the Cyrus server where the calendar data is stored?
$params['server'] = 'localhost';
// What is the Base DN of our LDAP database?
$params['base_dn'] = '@@@base_dn@@@';
// What DN should we use to bind to the LDAP server?
$params['bind_dn'] = '@@@bind_dn@@@';
// What password should we use with the above DN when binding?
$params['bind_pw'] = '@@@bind_pw@@@';
// 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@@@';
// Are we using virtual domains with Cyrus?
$params['virtual_domains'] = true;
// 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 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'] = 'manager';
$params['calendar_pass'] = '@@@bind_pw@@@';
// What is the name of the users' calendar mailbox?
$params['calendar_store'] = 'Calendar';
// Where can we get free/busy information from?
$params['freebusy_url'] = 'http://localhost/freebusy/${USER}.vfb?x=';
--- NEW FILE: freebusy.conf.template ---
<?php
// What is the address of the Cyrus server where the calendar data is stored?
// This is also used as the LDAP server address where user objects reside
$params['server'] = '@@@fqhostname@@@';
// What is the Base DN of our LDAP database?
$params['base_dn'] = '@@@base_dn@@@';
// What DN should we use to bind to the LDAP server?
$params['bind_dn'] = '@@@bind_dn@@@';
// What password should we use with the above DN when binding?
$params['bind_pw'] = '@@@bind_pw@@@';
// Are we using a multi-location setup? If this is true, we check the users'
// LDAP object for the next attribute - if it is different than $params['server']
// we get the free/busy information from the script running on the other box
$params['multi_location'] = true;
// What LDAP attribute is used to store the users' home server address?
$params['home_server'] = 'homeServer';
// 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'] = 'auriga.hrhansen.dk';
// Are we using virtual domains with Cyrus?
$params['virtual_domains'] = true;
// 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 account should we use to read in calendar data? This account should
// have access to the calendar mailbox of all the users for which free/busy
// information is to be retrieved.
$params['calendar_user'] = 'manager@'.$params['email_domain'];
// What password should we use with the above account?
$params['calendar_pass'] = '@@@bind_pw@@@';
// What is the name of the users' calendar mailbox?
$params['calendar_store'] = 'Calendar';
// How many days of free/busy data should we generate?
$params['freebusy_days'] = 56;
// Should we redirect using a Location header, if the user is not local? If this
// is false we silently download the file ourselves and output it so that it
// looks as though the free/busy information is coming from us.
$params['redirect'] = false;
// Should we send a Content-Type header, indicating what the mime type of the
// resulting VFB file is?
$params['send_content_type'] = false;
// Should we send a Content-Length header, indicating how large the resulting
// VFB file is?
$params['send_content_length'] = false;
// Should we send a Content-Disposition header, indicating what the name of the
// resulting VFB file should be?
$params['send_content_disposition'] = false;
--- NEW FILE: imapd.replicas.template ---
## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
## Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
##
## This program is Free Software under the GNU General Public License (>=v2).
## Read the file COPYING that comes with this packages for details.
# Replica statements for inclusion in imapd.conf
--- NEW FILE: resmgr.conf.template ---
<?php
// What is the root directory of our Horde instance?
@define('HORDE_BASE', '@l_prefix@/var/kolab/www/fbview');
// What is the address of the Cyrus server where the calendar data is stored?
$params['server'] = '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 email address.
$params['email_domain'] = '@@@postfix-mydomain@@@';
// Are we using virtual domains with Cyrus?
$params['virtual_domains'] = true;
// 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 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'] = 'manager@'.$params['email_domain'];
$params['calendar_pass'] = '@@@bind_pw@@@';
// What is the name of the users' calendar mailbox?
$params['calendar_store'] = 'Calendar';
// Where can we get free/busy information from?
$params['freebusy_url'] = 'http://localhost/freebusy/${USER}.vfb';
// Where are we logging to?
$params['log'] = 'file:@l_prefix@/var/resmgr/resmgr.log'; // File...
// $params['log'] = 'syslog:cons, pid'; // Or syslog...
// 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;
// Is this script being used for groups? If this is false, the script acts as
// a plain resource handler.
// NO LONGER USED: This is now specified through a "-g" command line switch
// $params['group'] = true;
// What default action should be taken when an event occurs? Can be one of:
// RM_ACT_ALWAYS_ACCEPT always accept the request
// RM_ACT_ALWAYS_REJECT always rejects the request
// RM_ACT_REJECT_IF_CONFLICTS reject if there is a conflict
//
// The following are only for groups:
// RM_ACT_MANUAL_IF_CONFLICTS handle manually if it conflicts
// RM_ACT_MANUAL always handle manually
//
// This is overridden by a "-m" command line switch
$params['action'] = RM_ACT_REJECT_IF_CONFLICTS;
Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- httpd.conf.template 7 Jun 2004 10:33:03 -0000 1.1
+++ httpd.conf.template 11 Jun 2004 08:55:05 -0000 1.2
@@ -38,6 +38,7 @@
<Location /freebusy>
# SSLVerifyClient require
# SSLVerifyDepth 1
+ForceType application/x-httpd-php
</Location>
#<IfModule !mpm_winnt.c>
@@ -165,33 +166,33 @@
@@@legacy-mode@@@
-<Directory "@l_prefix@/var/kolab/www/freebusy">
-
- Dav On
- AllowOverride None
- Options None
- # Disallow for everyone as default
- Order allow,deny
- <Limit GET PUT LOCK UNLOCK PROPFIND HEAD OPTIONS>
- Allow from all
- Require valid-user
- </Limit>
- AuthType Basic
- AuthName "Kolab Freebusy (webdav)"
-
- LDAP_Server @@@ldap_ip@@@
- LDAP_Port @@@ldap_port@@@
- Base_DN "@@@base_dn@@@"
- # temporary : openldap changed from 2.1.9 to 2.1.12
- # anonymous bind with dn is nolonger allowed
- # unfortunately mod_auth_ldap seems to exactly do so
- # need to investigate ...
- Bind_DN "@@@php_dn@@@"
- Bind_Pass "@@@php_pw@@@"
- UID_Attr uid
- DavMinTimeout 600
- AddDefaultCharset Off
-</Directory>
+#<Directory "@l_prefix@/var/kolab/www/freebusy">
+#
+# Dav On
+# AllowOverride None
+# Options None
+# # Disallow for everyone as default
+# Order allow,deny
+# <Limit GET PUT LOCK UNLOCK PROPFIND HEAD OPTIONS>
+# Allow from all
+# Require valid-user
+# </Limit>
+# AuthType Basic
+# AuthName "Kolab Freebusy (webdav)"
+#
+# LDAP_Server @@@ldap_ip@@@
+# LDAP_Port @@@ldap_port@@@
+# Base_DN "@@@base_dn@@@"
+# # temporary : openldap changed from 2.1.9 to 2.1.12
+# # anonymous bind with dn is nolonger allowed
+# # unfortunately mod_auth_ldap seems to exactly do so
+# # need to investigate ...
+# Bind_DN "@@@php_dn@@@"
+# Bind_Pass "@@@php_pw@@@"
+# UID_Attr uid
+# DavMinTimeout 600
+# AddDefaultCharset Off
+#</Directory>
<Directory "@l_prefix@/var/kolab/www/webcalendar">
Dav On
@@ -217,6 +218,11 @@
UID_Attr uid
DavMinTimeout 600
AddDefaultCharset Off
+</Directory>
+
+<Directory "/kolab/var/kolab/www/fbview">
+ AllowOverride All
+ Allow from all
</Directory>
<Directory "@l_prefix@/var/kolab/www/admin">
Index: imapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/imapd.conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imapd.conf.template 7 Jun 2004 10:33:03 -0000 1.1
+++ imapd.conf.template 11 Jun 2004 08:55:05 -0000 1.2
@@ -43,3 +43,5 @@
#mupdate_port: 3905
#mupdate_authname: manager
#mupdate_password: @@@bind_pw@@@
+
+ at include: @l_prefix@/etc/imapd/imapd.replicas
Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/main.cf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.cf.template 7 Jun 2004 10:33:03 -0000 1.1
+++ main.cf.template 11 Jun 2004 08:55:05 -0000 1.2
@@ -22,7 +22,8 @@
# local host
myhostname = @@@fqhostname@@@
mydomain = @@@postfix-mydomain@@@
-myorigin = $myhostname
+myorigin = $mydomain
+
#
masquerade_domains = $mydomain
masquerade_exceptions = root
Index: php.ini.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/php.ini.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- php.ini.template 7 Jun 2004 10:33:03 -0000 1.1
+++ php.ini.template 11 Jun 2004 08:55:05 -0000 1.2
@@ -86,7 +86,7 @@
engine = On
; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
-short_open_tag = On
+short_open_tag = Off
; Allow ASP-style <% %> tags.
asp_tags = Off
Index: session_vars.php.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/session_vars.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- session_vars.php.template 7 Jun 2004 10:33:03 -0000 1.1
+++ session_vars.php.template 11 Jun 2004 08:55:05 -0000 1.2
@@ -1,4 +1,4 @@
-<?
+<?php
/*
# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
More information about the commits
mailing list