stuart: releng/kolab/templates amavisd.conf, 1.1.1.1, 1.2 clamav.conf, 1.1.1.1, 1.2 cyrus.conf, 1.1.1.1, 1.2 freshclam.conf, 1.1.1.1, 1.2 httpd.conf, 1.1.1.1, 1.2 imapd.conf, 1.1.1.1, 1.2 imapd.group, 1.1.1.1, 1.2 legacy.conf, 1.1.1.1, 1.2 main.cf, 1.1.1.1, 1.2 master.cf, 1.1.1.1, 1.2 php.ini, 1.1.1.1, 1.2 proftpd.conf, 1.1.1.1, 1.2 saslauthd.conf, 1.1.1.1, 1.2 session_vars.php, 1.1.1.1, 1.2 slapd.conf, 1.1.1.1, 1.2 smtpd.conf, 1.1.1.1, 1.2 transport, 1.1.1.1, 1.2 virtual, 1.1.1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Wed May 12 14:35:43 CEST 2004
Author: stuart
Update of /kolabrepository/releng/kolab/templates
In directory doto:/tmp/cvs-serv23476
Modified Files:
amavisd.conf clamav.conf cyrus.conf freshclam.conf httpd.conf
imapd.conf imapd.group legacy.conf main.cf master.cf php.ini
proftpd.conf saslauthd.conf session_vars.php slapd.conf
smtpd.conf transport virtual
Log Message:
Added initial template metadata
Index: amavisd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/amavisd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- amavisd.conf 3 May 2004 14:06:51 -0000 1.1.1.1
+++ amavisd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,5 +1,20 @@
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+destination : @l_prefix@/etc/amavisd/amavisd.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+# on_change : do we need to restart anything?
+
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
use strict;
@@ -42,7 +57,7 @@
# within the string. In other words, $ and # lose their special meaning
# within a qw argument, just like within '...' strings.
# - all e-mail addresses in this file and as used internally by the daemon
-# are in their raw (rfc2821-unquoted and nonbracketed) form, i.e.
+# are in their raw (rfc2821-unquoted and nonbracketed) form, i.e.
# Bob "Funny" Dude at example.com, not: "Bob \"Funny\" Dude"@example.com
# and not <"Bob \"Funny\" Dude"@example.com>; also: '' and not '<>'.
@@ -1332,7 +1347,7 @@
['MkS_Vir for Linux (beta)', ['mks32','mks'],
'-s {}/*', [0], [1,2],
- qr/--[ \t]*(.+)/ ],
+ qr/--[ \t]*(.+)/ ],
['MkS_Vir daemon',
'mksscan', '-s -q {}', [0], [1..7],
@@ -1385,7 +1400,7 @@
### http://www.virusbuster.hu/en/
['VirusBuster', ['vbuster', 'vbengcl'],
- # VirusBuster Ltd. does not support the daemon version for the workstation
+ # VirusBuster Ltd. does not support the daemon version for the workstation
# engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of
# binaries, some parameters AND return codes (from 3 to 1) changed.
"{} -ss -i '*' -log=$MYHOME/vbuster.log", [0], [1],
Index: clamav.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/clamav.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- clamav.conf 3 May 2004 14:06:47 -0000 1.1.1.1
+++ clamav.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,5 +1,20 @@
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+destination : @l_prefix@/etc/clamav/clamav.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+# on_change : do we need to restart anything?
+
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
##
## Example config file for the Clam AV daemon
@@ -184,7 +199,7 @@
# Mark potential archive bombs as viruses (0 disables the limit)
ArchiveMaxCompressionRatio 200
-# Use slower decompression algorithm which uses less memory. This option
+# Use slower decompression algorithm which uses less memory. This option
# affects bzip2 decompressor only.
#ArchiveLimitMemoryUsage
Index: cyrus.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/cyrus.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- cyrus.conf 3 May 2004 14:06:46 -0000 1.1.1.1
+++ cyrus.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,11 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
+destination : @l_prefix@/etc/imapd/cyrus.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc imapd restart
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
START {
Index: freshclam.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/freshclam.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- freshclam.conf 3 May 2004 14:06:46 -0000 1.1.1.1
+++ freshclam.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,5 +1,20 @@
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+destination : @l_prefix@/etc/clamav/freshclam.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+# on_change : do we need to restart anything?
+
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
##
## Example config file for freshclam
Index: httpd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/httpd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- httpd.conf 3 May 2004 14:06:47 -0000 1.1.1.1
+++ httpd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,11 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
+destination : @l_prefix@/etc/apache/apache.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/sbin/apachectl graceful
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
### Section 1: Global Environment
ServerRoot "@l_prefix@"
@@ -32,14 +41,14 @@
<Directory "@l_prefix@/var/kolab/www/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
-
+
</VirtualHost>
<Location /freebusy>
# SSLVerifyClient require
# SSLVerifyDepth 1
</Location>
-
+
#<IfModule !mpm_winnt.c>
#<IfModule !mpm_netware.c>
#LockFile var/apache/log/accept.lock
@@ -76,7 +85,7 @@
StartServers 2
MaxClients 150
MinSpareThreads 25
-MaxSpareThreads 75
+MaxSpareThreads 75
ThreadsPerChild 25
MaxRequestsPerChild 0
</IfModule>
@@ -113,7 +122,7 @@
# Allow from all
#</Directory>
-#DirectoryIndex index.html
+#DirectoryIndex index.html
AccessFileName .htaccess
<Location />
@@ -190,7 +199,7 @@
Bind_Pass "@@@php_pw@@@"
UID_Attr uid
DavMinTimeout 600
- AddDefaultCharset Off
+ AddDefaultCharset Off
</Directory>
<Directory "@l_prefix@/var/kolab/www/webcalendar">
@@ -329,7 +338,7 @@
AddCharset ISO-10646-UCS-4 .ucs4
AddCharset UTF-8 .utf8
-AddCharset GB2312 .gb2312 .gb
+AddCharset GB2312 .gb2312 .gb
AddCharset utf-7 .utf7
AddCharset utf-8 .utf8
AddCharset big5 .big5 .b5
Index: imapd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/imapd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- imapd.conf 3 May 2004 14:06:47 -0000 1.1.1.1
+++ imapd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,11 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
+destination : @l_prefix@/etc/imapd/imapd.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc imapd reload
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
# Warning: Do not use a trailing slash in paths!
configdirectory: @l_prefix@/var/imapd
Index: imapd.group
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/imapd.group,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- imapd.group 3 May 2004 14:06:47 -0000 1.1.1.1
+++ imapd.group 12 May 2004 12:35:41 -0000 1.2
@@ -1,7 +1,18 @@
-## Copyright (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-## Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-## This program is Free Software under the GNU General Public License (>=v2).
-## Read the file COPYING that comes with this packages for details.
+disabled : 1
+
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
# gid's over 60000 are reserved for LDAP groups !
Index: legacy.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/legacy.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- legacy.conf 3 May 2004 14:06:47 -0000 1.1.1.1
+++ legacy.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,3 +1,8 @@
+destination : @l_prefix@/etc/apache/legacy.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/sbin/apachectl graceful
+
+__END_KOLAB_META__
<Directory "@l_prefix@/var/kolab/www/freebusy">
AllowOverride None
Index: main.cf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/main.cf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- main.cf 3 May 2004 14:06:46 -0000 1.1.1.1
+++ main.cf 12 May 2004 12:35:41 -0000 1.2
@@ -1,12 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
+destination : @l_prefix@/etc/postfix/main.cf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc postfix reload
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
# paths
command_directory = @l_prefix@/sbin
@@ -22,7 +30,7 @@
myhostname = @@@fqhostname@@@
mydomain = @@@postfix-mydomain@@@
myorigin = $myhostname
-#
+#
masquerade_domains = $mydomain
masquerade_exceptions = root
@@ -33,8 +41,8 @@
# relaying
mynetworks = @@@postfix-mynetworks@@@
mydestination = @@@postfix-mydestination@@@
-relay_domains =
-#smtpd_recipient_restrictions = permit_mynetworks,
+relay_domains =
+#smtpd_recipient_restrictions = permit_mynetworks,
# check_client_access hash:/kolab/etc/postfix/access,
# check_relay_domains
@@ -46,7 +54,7 @@
transport_maps = hash:@l_prefix@/etc/postfix/transport
alias_maps = hash:@l_prefix@/etc/postfix/aliases
alias_database = hash:@l_prefix@/etc/postfix/aliases
-local_recipient_maps =
+local_recipient_maps =
# local delivery
recipient_delimiter = +
Index: master.cf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/master.cf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- master.cf 3 May 2004 14:06:47 -0000 1.1.1.1
+++ master.cf 12 May 2004 12:35:41 -0000 1.2
@@ -1,12 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
+destination : @l_prefix@/etc/postfix/master.cf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc postfix reload
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
25 inet n - n - - smtpd
#628 inet n - n - - qmqpd
@@ -28,7 +36,7 @@
#uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/kolab/bin/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
#ifmail unix - n n - - pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)
#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
+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
smtp-amavis unix - - n - 2 smtp
-o smtp_data_done_timeout=1200
Index: php.ini
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/php.ini,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- php.ini 3 May 2004 14:06:48 -0000 1.1.1.1
+++ php.ini 12 May 2004 12:35:41 -0000 1.2
@@ -1,9 +1,21 @@
-[PHP]
-; (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-; (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-; This program is Free Software under the GNU General Public License (>=v2).
-; Read the file COPYING that comes with this packages for details.
+destination : @l_prefix@/etc/apache/php.ini
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/sbin/apachectl graceful
+__END_KOLAB_META__
+[PHP]
+;
+; See the file CONTRIBUTORS that was distributed with this program for
+; copyright information.
+;
+; This is free software; see the source for copying conditions. There is NO
+; warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+; to the extent permitted by law. See the file COPYING for license details.
+;
+; This file is automatically generated by the Kolab backend. Manual
+; modifications will be lost unless they are made to the corresponding
+; template file in @l_prefix@/etc/kolab/templates/
+;
;;;;;;;;;;;;;;;;;;;
; About this file ;
@@ -152,7 +164,7 @@
; including files from this directory and its subdirectories.
; (directory must also be in include_path or full path must
; be used when including)
-safe_mode_include_dir =
+safe_mode_include_dir =
; When safe_mode is on, only executables located in the safe_mode_exec_dir
; will be allowed to be executed via the exec family of functions.
@@ -272,7 +284,7 @@
; Disable the inclusion of HTML tags in error messages.
;html_errors = Off
-
+
; String to output before an error message.
;error_prepend_string = "<font color=ff0000>"
@@ -293,11 +305,11 @@
; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
+; Default is "&".
;arg_separator.output = "&"
; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
+; Default is "&".
; NOTE: Every character in this directive is considered as separator!
;arg_separator.input = ";&"
@@ -336,7 +348,7 @@
magic_quotes_gpc = Off
; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
+magic_quotes_runtime = Off
; Use Sybase-style magic quotes (escape ' with '' instead of \').
magic_quotes_sybase = Off
@@ -353,14 +365,14 @@
default_mimetype = "text/html"
;default_charset = "iso-8859-1"
-; Always populate the $HTTP_RAW_POST_DATA variable.
+; Always populate the $HTTP_RAW_POST_DATA variable.
;always_populate_raw_post_data = On
;;;;;;;;;;;;;;;;;;;;;;;;;
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;
-; UNIX: "/path1:/path2"
+; UNIX: "/path1:/path2"
;include_path = ".:/php/includes"
;
; Windows: "\path1;\path2"
@@ -391,7 +403,7 @@
; **You CAN safely turn this off for IIS, in fact, you MUST.**
; cgi.force_redirect = 1
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
; will look for to know it is OK to continue execution. Setting this variable MAY
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
@@ -442,7 +454,7 @@
;
; extension=msql.so
;
-; Note that it should be the name of the module only; no directory information
+; Note that it should be the name of the module only; no directory information
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.
@@ -521,7 +533,7 @@
[Java]
;java.class.path = .\php_java.jar
;java.home = c:\jdk
-;java.library = c:\jdk\jre\bin\hotspot\jvm.dll
+;java.library = c:\jdk\jre\bin\hotspot\jvm.dll
;java.library.path = .\
[SQL]
@@ -542,16 +554,16 @@
odbc.max_persistent = -1
; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
+odbc.max_links = -1
; Handling of LONG fields. Returns number of bytes to variables. 0 means
; passthru.
-odbc.defaultlrl = 4096
+odbc.defaultlrl = 4096
; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
+odbc.defaultbinmode = 1
[MySQL]
; Allow or prevent persistent links.
@@ -699,7 +711,7 @@
session.save_handler = files
; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
+; where data files are stored. Note: Windows users have to change this
; variable in order to use PHP's session functions.
session.save_path = /tmp
@@ -755,7 +767,7 @@
session.cache_expire = 180
; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
+; Use of trans sid may risk your users security.
; Use this option with caution.
; - User may send URL contains active session ID
; to other person via. email/irc/etc.
@@ -859,7 +871,7 @@
[com]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
+;com.typelib_file =
; allow Distributed-COM calls
;com.allow_dcom = true
; autoregister constants of a components typlib on com_load()
@@ -882,7 +894,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
-;fbsql.default_database =
+;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
;fbsql.default_password =
Index: proftpd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/proftpd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- proftpd.conf 3 May 2004 14:06:48 -0000 1.1.1.1
+++ proftpd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,12 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
+destination : @l_prefix@/etc/proftpd/proftpd.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc proftpd restart
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
ServerType standalone
DefaultServer on
Index: saslauthd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/saslauthd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- saslauthd.conf 3 May 2004 14:06:48 -0000 1.1.1.1
+++ saslauthd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,12 +1,20 @@
-# (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>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
+destination : @l_prefix@/etc/sasl/saslauthd.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc saslauthd restart
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
ldap_servers: @@@user_ldap_uri@@@
#ldap_servers: <ldap://localhost/>
Index: session_vars.php
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/session_vars.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- session_vars.php 3 May 2004 14:06:48 -0000 1.1.1.1
+++ session_vars.php 12 May 2004 12:35:41 -0000 1.2
@@ -1,11 +1,20 @@
-<?
+destination : ${kolab_var_dir}/www/admin/include/session_vars.php
+
+__END_KOLAB_META__
+<?php
/*
-# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
+ * See the file CONTRIBUTORS that was distributed with this program for
+ * copyright information.
+ *
+ * This is free software; see the source for copying conditions. There is NO
+ * warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+ * to the extent permitted by law. See the file COPYING for license details.
+ *
+ * This file is automatically generated by the Kolab backend. Manual
+ * modifications will be lost unless they are made to the corresponding
+ * template file in @l_prefix@/etc/kolab/templates/
+ */
-*/
session_start();
$_SESSION['ldap_server'] = "@@@ldap_ip@@@";
Index: slapd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/slapd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- slapd.conf 3 May 2004 14:06:48 -0000 1.1.1.1
+++ slapd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,15 +1,20 @@
-# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2004 Martin Konold <martin.konold at erfrakon.de>
-# (c) 2003 Achim Frank <achim.frank at erfrakon.de>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
-
-# this file is automatically written by the Kolab config backend and should have the
-# file mode 0640
+destination : @l_prefix@/etc/openldap/slapd.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc openldap restart
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is @l_prefix@/etc/kolab/slapd.conf.template
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
include @l_prefix@/etc/openldap/schema/kolab.schema
include @l_prefix@/etc/openldap/schema/kolab-cf.schema
@@ -101,7 +106,7 @@
by group="cn=admin,@@@base_dn@@@" write
by group="cn=maintainer,@@@base_dn@@@" write
by self write
- by dn="cn=nobody,@@@base_dn@@@" read
+ by dn="cn=nobody,@@@base_dn@@@" read
by anonymous auth stop
access to dn.regex="(.*,)?cn=external,@@@base_dn@@@"
@@ -110,20 +115,20 @@
by * read stop
access to dn="cn=external,@@@base_dn@@@"
- by dn="cn=nobody,@@@base_dn@@@" read
+ by dn="cn=nobody,@@@base_dn@@@" read
by * search stop
access to dn="cn=internal,@@@base_dn@@@"
- by dn="cn=nobody,@@@base_dn@@@" read
+ by dn="cn=nobody,@@@base_dn@@@" read
by * search stop
access to dn="k=kolab,@@@base_dn@@@"
by group="cn=admin,@@@base_dn@@@" write
by group="cn=maintainer,@@@base_dn@@@" read
- by dn="cn=nobody,@@@base_dn@@@" read
+ by dn="cn=nobody,@@@base_dn@@@" read
by * none stop
-access to *
+access to *
by self write
by group="cn=admin,@@@base_dn@@@" write
by group="cn=maintainer,@@@base_dn@@@" write
Index: smtpd.conf
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/smtpd.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- smtpd.conf 3 May 2004 14:06:48 -0000 1.1.1.1
+++ smtpd.conf 12 May 2004 12:35:41 -0000 1.2
@@ -1,2 +1,20 @@
+destination : @l_prefix@/etc/sasl/apps/smtpd.conf
+diff_cmd : diff -q ${OLD_CONFIG_FILE} ${NEW_CONFIG_FILE}
+on_change : @l_prefix@/etc/rc saslauthd restart
+
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
+
pwcheck_method: saslauthd
mech_list: plain login
Index: transport
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/transport,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- transport 3 May 2004 14:06:48 -0000 1.1.1.1
+++ transport 12 May 2004 12:35:41 -0000 1.2
@@ -1,8 +1,15 @@
-# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+disabled : 1
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
Index: virtual
===================================================================
RCS file: /kolabrepository/releng/kolab/templates/virtual,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- virtual 3 May 2004 14:06:48 -0000 1.1.1.1
+++ virtual 12 May 2004 12:35:41 -0000 1.2
@@ -1,8 +1,15 @@
-# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
+disabled : 1
+__END_KOLAB_META__
+#
+# See the file CONTRIBUTORS that was distributed with this program for
+# copyright information.
+#
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
+# to the extent permitted by law. See the file COPYING for license details.
+#
+# This file is automatically generated by the Kolab backend. Manual
+# modifications will be lost unless they are made to the corresponding
+# template file in @l_prefix@/etc/kolab/templates/
+#
More information about the commits
mailing list