Adapt kolabd templates for updated OpenPKG packages diff --git a/kolabd/kolabd/Makefile.am b/kolabd/kolabd/Makefile.am --- a/kolabd/kolabd/Makefile.am +++ b/kolabd/kolabd/Makefile.am @@ -47,6 +47,7 @@ kolabtemplate_FILES = templates/amavisd. templates/freshclam.conf.template \ templates/httpd.conf.template \ templates/httpd.local.template \ + templates/imapd.annotation_definitions.template \ templates/imapd.conf.template \ templates/imapd.group.template \ templates/kolab.conf.template \ @@ -349,6 +350,12 @@ CLEANFILES += templates/httpd.local.temp CLEANFILES += templates/httpd.local.template EXTRA_DIST += templates/httpd.local.template.in +templates/imapd.annotation_definitions.template: + @$(mkinstalldirs) templates + $(do_subst) <$(srcdir)/templates/imapd.annotation_definitions.template.in >$@ +CLEANFILES += templates/imapd.annotation_definitions.template +EXTRA_DIST += templates/imapd.annotation_definitions.template.in + templates/imapd.conf.template: @$(mkinstalldirs) templates $(do_subst) <$(srcdir)/templates/imapd.conf.template.in >$@ diff --git a/kolabd/kolabd/templates/httpd.conf.template.in b/kolabd/kolabd/templates/httpd.conf.template.in --- a/kolabd/kolabd/templates/httpd.conf.template.in +++ b/kolabd/kolabd/templates/httpd.conf.template.in @@ -1,5 +1,5 @@ KOLAB_META_START KOLAB_META_START -TARGET=@webserver_confdir@/apache.conf +TARGET=@webserver_confdir@/apache2.conf PERMISSIONS=0640 OWNERSHIP=@webserver_usr@:@webserver_grp@ KOLAB_META_END @@ -82,7 +82,8 @@ MaxKeepAliveRequests 100 MaxKeepAliveRequests 100 KeepAliveTimeout 15 - + +PidFile @webserver_pidfile@ StartServers 5 MinSpareServers 5 MaxSpareServers 10 @@ -90,16 +91,17 @@ MaxRequestsPerChild 0 MaxRequestsPerChild 0 - + StartServers 2 MaxClients 150 MinSpareThreads 25 MaxSpareThreads 75 ThreadsPerChild 25 MaxRequestsPerChild 0 +ServerLimit 16 - + NumServers 5 StartThreads 5 MinSpareThreads 5 @@ -160,9 +162,9 @@ AccessFileName .htaccess # FIXME: not autoconfigured - still hardcoded -TypesConfig etc/apache/mime.types +TypesConfig etc/apache2/mime.types DefaultType text/plain - + MIMEMagicFile @webserver_confdir@/mime.magic @@ -236,21 +238,17 @@ DavLockDB @webserver_document_root@/lock AuthType Basic AuthName "Kolab Freebusy" - 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_Filter "(|(uid=%u)(mail=%u))" + AuthLDAPUrl "@@@ldap_uri@@@/@@@base_dn@@@?mail??" + AuthBasicAuthoritative off + AuthUserFile /dev/null + AuthBasicProvider ldap + AuthzLDAPAuthoritative off + AuthLDAPBindDN "@@@php_dn@@@" + AuthLDAPBindPassword "@@@php_pw@@@" + # FIXME: support authenticating with uid, too @@@endif@@@ DavMinTimeout 600 AddDefaultCharset Off - php_value include_path ".:@phplibdir2@:@phppeardir@:/php/include:@phplibdir@" - #php_admin_flag safe_mode on @@ -265,16 +263,14 @@ DavLockDB @webserver_document_root@/lock 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_Filter "(|(uid=%u)(mail=%u))" + AuthLDAPUrl "@@@ldap_uri@@@/@@@base_dn@@@?mail??" + AuthBasicAuthoritative off + AuthUserFile /dev/null + AuthBasicProvider ldap + AuthzLDAPAuthoritative off + AuthLDAPBindDN "@@@php_dn@@@" + AuthLDAPBindPassword "@@@php_pw@@@" + # FIXME: support authenticating with uid, too DavMinTimeout 600 AddDefaultCharset Off @@ -282,7 +278,6 @@ DavLockDB @webserver_document_root@/lock AllowOverride All Allow from all - php_value include_path ".:@phplibdir2@:@phppeardir@:/php/include:@phplibdir@" @@ -403,6 +398,7 @@ AddCharset EUC-KR .euc-kr AddCharset EUC-KR .euc-kr AddCharset shift_jis .sjis +LoadModule php5_module @libexecdir@/apache2/libphp5.so AddType application/x-tar .tgz AddType application/x-httpd-php .php .php4 .php3 .html AddType image/x-icon .ico @@ -419,4 +415,4 @@ BrowserMatch "^WebDAVFS/1.[012]" redirec BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully # used for local non Kolab extension -Include @webserver_confdir@/apache.local +Include @webserver_confdir@/apache2.local diff --git a/kolabd/kolabd/templates/httpd.local.template.in b/kolabd/kolabd/templates/httpd.local.template.in --- a/kolabd/kolabd/templates/httpd.local.template.in +++ b/kolabd/kolabd/templates/httpd.local.template.in @@ -1,5 +1,5 @@ KOLAB_META_START KOLAB_META_START -TARGET=@webserver_confdir@/apache.local +TARGET=@webserver_confdir@/apache2.local PERMISSIONS=0640 OWNERSHIP=@webserver_musr@:@webserver_grp@ KOLAB_META_END @@ -13,7 +13,7 @@ KOLAB_META_END # The purpose of this file is to add local non Kolab specific extensions to # the Apache installation. This file gets included at the end of the Apache -# configuration file (apache.conf) +# configuration file (apache2.conf) # e.g. # ScriptAlias /nagios/cgi-bin/ @libdir@/nagios/cgi/ diff --git a/kolabd/kolabd/templates/imapd.annotation_definitions.template.in b/kolabd/kolabd/templates/imapd.annotation_definitions.template.in new file mode 100644 --- /dev/null +++ b/kolabd/kolabd/templates/imapd.annotation_definitions.template.in @@ -0,0 +1,9 @@ +KOLAB_META_START +TARGET=@imap_confdir@/imapd.annotation_definitions +PERMISSIONS=0640 +OWNERSHIP=@imap_usr@:@imap_grp@ +KOLAB_META_END +/vendor/kolab/folder-test,mailbox,string,backend,value.shared value.priv,a +/vendor/kolab/folder-type,mailbox,string,backend,value.shared value.priv,a +/vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a +/vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a diff --git a/kolabd/kolabd/templates/imapd.conf.template.in b/kolabd/kolabd/templates/imapd.conf.template.in --- a/kolabd/kolabd/templates/imapd.conf.template.in +++ b/kolabd/kolabd/templates/imapd.conf.template.in @@ -91,3 +91,6 @@ duplicatesuppression: 0 # The minimum value is 1. A value of 0 will disable polling (and disable IDLE if polling is # the only method available). imapidlepoll: 5 + +# Load definitions for vendor annotations +annotation_definitions: /kolab/etc/imapd/imapd.annotation_definitions diff --git a/kolabd/kolabd/templates/master.cf.template.in b/kolabd/kolabd/templates/master.cf.template.in --- a/kolabd/kolabd/templates/master.cf.template.in +++ b/kolabd/kolabd/templates/master.cf.template.in @@ -35,11 +35,13 @@ relay unix - - n relay unix - - n - - smtp -o fallback_relay= showq unix n - n - - showq error unix - - n - - error +retry unix - - n - - error local unix - n n - - local #virtual unix - n n - - virtual lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil scache unix - - n - 1 scache +#maildrop unix - n n - - pipe flags=DRhu user=vmail argv=@bindir@/maildrop -d ${recipient} #cyrus unix - n n - - pipe user=cyrus argv=@bindir@/cyrdeliver -e -r ${sender} -m ${extension} ${user} #uucp unix - n n - - pipe flags=Fqhu user=uucp argv=@bindir@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient) #ifmail unix - n n - - pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient) @@ -91,7 +93,7 @@ 127.0.0.1:10026 inet n - n - - smtpd -o smtpd_hard_error_limit=1000 kolabpolicy unix - n n - - spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy -kolabfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@PHP@ +kolabfilter unix - n n - - pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@ -c @phpini_dir@/php.ini -f @resmgr_scriptsdir@/kolabfilter.php -- @@ -101,7 +103,7 @@ kolabfilter unix - n n -c ${client_address} -u ${sasl_username} -kolabmailboxfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@PHP@ +kolabmailboxfilter unix - n n - - pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@ -c @phpini_dir@/php.ini -f @resmgr_scriptsdir@/kolabmailboxfilter.php -- diff --git a/kolabd/kolabd/templates/php.ini.template.in b/kolabd/kolabd/templates/php.ini.template.in --- a/kolabd/kolabd/templates/php.ini.template.in +++ b/kolabd/kolabd/templates/php.ini.template.in @@ -3,903 +3,28 @@ PERMISSIONS=0640 PERMISSIONS=0640 OWNERSHIP=@webserver_musr@:@webserver_grp@ KOLAB_META_END +;; +;; php.ini -- PHP Configuration +;; + [PHP] -; (c) 2003 Tassilo Erlewein -; (c) 2003 Martin Konold -; This program is Free Software under the GNU General Public License (>=v2). -; Read the file COPYING that comes with this packages for details. +; Resource Limits +register_globals = off ; Global variables are no longer registered for input data +safe_mode = off ; Enable Safe Mode (file UID comparisons) +safe_mode_gid = off ; Whether to relax Safe Mode to file GID comparisons +allow_url_fopen = on ; Disable the opening of remote URLs +display_errors = off ; Errors will NOT be displayed +log_errors = on ; Errors will be logged +max_execution_time = 120 ; Maximum execution time of each script, in seconds +max_input_time = 60 ; Maximum amount of time each script may spend parsing request data +memory_limit = 16M ; Maximum amount of memory a script may consume +post_max_size = 8M ; Maximum amount of POST data accepted -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; -; This is the recommended, PHP 4-style version of the php.ini-dist file. It -; sets some non standard settings, that make PHP more efficient, more secure, -; and encourage cleaner coding. -; The price is that with these settings, PHP may be incompatible with some -; applications, and sometimes, more difficult to develop with. Using this -; file is warmly recommended for production sites. As all of the changes from -; the standard settings are thoroughly documented, you can go over each one, -; and decide whether you want to use it or not. -; -; For general information about the php.ini file, please consult the php.ini-dist -; file, included in your PHP distribution. -; -; This file is different from the php.ini-dist file in the fact that it features -; different values for several directives, in order to improve performance, while -; possibly breaking compatibility with the standard out-of-the-box behavior of -; PHP 3. Please make sure you read what's different, and modify your scripts -; accordingly, if you decide to use this file instead. -; -; - register_globals = Off [Security, Performance] -; Global variables are no longer registered for input data (POST, GET, cookies, -; environment and other server variables). Instead of using $foo, you must use -; you can use $_REQUEST["foo"] (includes any variable that arrives through the -; request, namely, POST, GET and cookie variables), or use one of the specific -; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending -; on where the input originates. Also, you can look at the -; import_request_variables() function. -; Note that register_globals is going to be depracated (i.e., turned off by -; default) in the next version of PHP, because it often leads to security bugs. -; Read http://php.net/manual/en/security.registerglobals.php for further -; information. -; - display_errors = Off [Security] -; With this directive set to off, errors that occur during the execution of -; scripts will no longer be displayed as a part of the script output, and thus, -; will no longer be exposed to remote users. With some errors, the error message -; content may expose information about your script, web server, or database -; server that may be exploitable for hacking. Production sites should have this -; directive set to off. -; - log_errors = On [Security] -; This directive complements the above one. Any errors that occur during the -; execution of your script will be logged (typically, to your server's error log, -; but can be configured in several ways). Along with setting display_errors to off, -; this setup gives you the ability to fully understand what may have gone wrong, -; without exposing any sensitive information to remote users. -; - output_buffering = 4096 [Performance] -; Set a 4KB output buffer. Enabling output buffering typically results in less -; writes, and sometimes less packets sent on the wire, which can often lead to -; better performance. The gain this directive actually yields greatly depends -; on which Web server you're working with, and what kind of scripts you're using. -; - register_argc_argv = Off [Performance] -; Disables registration of the somewhat redundant $argv and $argc global -; variables. -; - magic_quotes_gpc = Off [Performance] -; Input data is no longer escaped with slashes so that it can be sent into -; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. -; - variables_order = "GPCS" [Performance] -; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access -; environment variables, you can use getenv() instead. -; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP surpresses errors of type E_NOTICE. These error messages -; are emitted for non-critical errors, but that could be a symptom of a bigger -; problem. Most notably, this will cause error messages about the use -; of uninitialized variables to be displayed. -; - allow_call_time_pass_reference = Off [Code cleanliness] -; It's not possible to decide to force a variable to be passed by reference -; when calling a function. The PHP 4 style to do this is by making the -; function require the relevant argument by reference. - - -;;;;;;;;;;;;;;;;;;;; -; Language Options ; -;;;;;;;;;;;;;;;;;;;; - -; Enable the PHP scripting language engine under Apache. -engine = On - -; Allow the tags are recognized. -short_open_tag = Off - -; Allow ASP-style <% %> tags. -asp_tags = Off - -; The number of significant digits displayed in floating point numbers. -precision = 14 - -; Enforce year 2000 compliance (will cause problems with non-compliant browsers) -y2k_compliance = Off - -; Output buffering allows you to send header lines (including cookies) even -; after you send body content, at the price of slowing PHP's output layer a -; bit. You can enable output buffering during runtime by calling the output -; buffering functions. You can also enable output buffering for all files by -; setting this directive to On. If you wish to limit the size of the buffer -; to a certain size - you can use a maximum number of bytes instead of 'On', as -; a value for this directive (e.g., output_buffering=4096). -output_buffering = 4096 - -; You can redirect all of the output of your scripts to a function. For -; example, if you set output_handler to "ob_gzhandler", output will be -; transparently compressed for browsers that support gzip or deflate encoding. -; Setting an output handler automatically turns on output buffering. -output_handler = - -; Transparent output compression using the zlib library -; Valid values for this option are 'off', 'on', or a specific buffer size -; to be used for compression (default is 4KB) -; -; Note: output_handler must be empty if this is set 'On' !!!! -; -zlib.output_compression = Off - -; Implicit flush tells PHP to tell the output layer to flush itself -; automatically after every output block. This is equivalent to calling the -; PHP function flush() after each and every call to print() or echo() and each -; and every HTML block. Turning this option on has serious performance -; implications and is generally recommended for debugging purposes only. -implicit_flush = Off - -; Whether to enable the ability to force arguments to be passed by reference -; at function call time. This method is deprecated and is likely to be -; unsupported in future versions of PHP/Zend. The encouraged method of -; specifying which arguments should be passed by reference is in the function -; declaration. You're encouraged to try and turn this option Off and make -; sure your scripts work properly with it in order to ensure they will work -; with future versions of the language (you will receive a warning each time -; you use this feature, and the argument will be passed by value instead of by -; reference). -allow_call_time_pass_reference = Off - -; -; Safe Mode -; -safe_mode = Off - -; By default, Safe Mode does a UID compare check when -; opening files. If you want to relax this to a GID compare, -; then turn on safe_mode_gid. -safe_mode_gid = Off - -; When safe_mode is on, UID/GID checks are bypassed when -; 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 = - -; 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. -safe_mode_exec_dir = - -; open_basedir, if set, limits all file operations to the defined directory -; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. -; -;open_basedir = - -; Setting certain environment variables may be a potential security breach. -; This directive contains a comma-delimited list of prefixes. In Safe Mode, -; the user may only alter environment variables whose names begin with the -; prefixes supplied here. By default, users will only be able to set -; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). -; -; Note: If this directive is empty, PHP will let the user modify ANY -; environment variable! -safe_mode_allowed_env_vars = PHP_ - -; This directive contains a comma-delimited list of environment variables that -; the end user won't be able to change using putenv(). These variables will be -; protected even if safe_mode_allowed_env_vars is set to allow to change them. -safe_mode_protected_env_vars = LD_LIBRARY_PATH - -; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_functions = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; would work. -highlight.string = #CC0000 -highlight.comment = #FF9900 -highlight.keyword = #006600 -highlight.bg = #FFFFFF -highlight.default = #0000CC -highlight.html = #000000 - - -; -; Misc -; -; Decides whether PHP may expose the fact that it is installed on the server -; (e.g. by adding its signature to the Web server header). It is no security -; threat in any way, but it makes it possible to determine whether you use PHP -; on your server or not. -expose_php = On - - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - -max_execution_time = 120 ; Maximum execution time of each script, in seconds -memory_limit = 16M ; Maximum amount of memory a script may consume (8MB) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; error_reporting is a bit-field. Or each number up to get desired error -; reporting level -; E_ALL - All errors and warnings -; E_ERROR - fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; -; Examples: -; -; - Show all errors, except for notices -; -error_reporting = E_ALL & ~E_NOTICE -; -; - Show only errors -; -;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR -; -; - Show all errors -; -;error_reporting = E_ALL - -; Print out errors (as a part of the output). For production web sites, -; you're strongly encouraged to turn this feature off, and use error logging -; instead (see below). Keeping display_errors enabled on a production web site -; may reveal security information to end users, such as file paths on your Web -; server, your database schema or other information. -display_errors = Off - -; Even when display_errors is on, errors that occur during PHP's startup -; sequence are not displayed. It's strongly recommended to keep -; display_startup_errors off, except for when debugging. -display_startup_errors = Off - -; Log errors into a log file (server-specific log, stderr, or error_log (below)) -; As stated above, you're strongly advised to use error logging in place of -; error displaying on production web sites. -log_errors = On - -; Store the last error/warning message in $php_errormsg (boolean). -track_errors = Off - -; Disable the inclusion of HTML tags in error messages. -;html_errors = Off - -; String to output before an error message. -;error_prepend_string = "" - -; String to output after an error message. -;error_append_string = "" - -; Log errors to specified file. -;error_log = filename - -; Log errors to syslog (Event Log on NT, not valid in Windows 95). -;error_log = syslog - - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; -; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 - -; The separator used in PHP generated URLs to separate arguments. -; Default is "&". -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". -; NOTE: Every character in this directive is considered as separator! -;arg_separator.input = ";&" - -; This directive describes the order in which PHP registers GET, POST, Cookie, -; Environment and Built-in variables (G, P, C, E & S respectively, often -; referred to as EGPCS or GPC). Registration is done from left to right, newer -; values override older values. -variables_order = "GPCS" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -register_globals = Off - -; This directive tells PHP whether to declare the argv&argc variables (that -; would contain the GET information). If you don't use these variables, you -; should turn it off for increased performance. -register_argc_argv = Off - -; Maximum size of POST data that PHP will accept. -post_max_size = 8M - -; This directive is deprecated. Use variables_order instead. -gpc_order = "GPC" - -; Magic quotes -; - -; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = Off - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). -magic_quotes_sybase = Off - -; Automatically add files before or after any PHP document. -auto_prepend_file = -auto_append_file = - -; As of 4.0b4, PHP always outputs a character encoding by default in -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html -default_mimetype = "text/html" -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. -;always_populate_raw_post_data = On - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -; -; Windows: "\path1;\path2" -;include_path = ".;c:\php\includes" -include_path = ".:/php/include:@phplibdir@:@phplibdir2@:@phppeardir@" - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -doc_root = - -; The directory under which PHP opens the script using /~usernamem used only -; if nonempty. -user_dir = - -; Directory in which the loadable extensions (modules) reside. -extension_dir = ./ - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. -enable_dl = On - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **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 -; (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. -; cgi.redirect_status_env = ; - - - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. -file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). -;upload_tmp_dir = - -; Maximum allowed size for uploaded files. -upload_max_filesize = 2M - - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -allow_url_fopen = On - -; Define the anonymous ftp password (your email address) -;from="john@doe.com" - - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; -; -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example, on Windows: -; -; extension=msql.dll -; -; ... or under UNIX: -; -; extension=msql.so -; -; 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. - - -;Windows Extensions -;Note that MySQL and ODBC support is now built in, so no dll is needed for it. -; -;extension=php_bz2.dll -;extension=php_ctype.dll -;extension=php_cpdf.dll -;extension=php_curl.dll -;extension=php_cybercash.dll -;extension=php_db.dll -;extension=php_dba.dll -;extension=php_dbase.dll -;extension=php_dbx.dll -;extension=php_domxml.dll -;extension=php_dotnet.dll -;extension=php_exif.dll -;extension=php_fbsql.dll -;extension=php_fdf.dll -;extension=php_filepro.dll -;extension=php_gd.dll -;extension=php_gettext.dll -;extension=php_hyperwave.dll -;extension=php_iconv.dll -;extension=php_ifx.dll -;extension=php_iisfunc.dll -;extension=php_imap.dll -;extension=php_ingres.dll -;extension=php_interbase.dll -;extension=php_java.dll -;extension=php_ldap.dll -;extension=php_mbstring.dll -;extension=php_mcrypt.dll -;extension=php_mhash.dll -;extension=php_ming.dll -;extension=php_mssql.dll -;extension=php_oci8.dll -;extension=php_openssl.dll -;extension=php_oracle.dll -;extension=php_pdf.dll -;extension=php_pgsql.dll -;extension=php_printer.dll -;extension=php_shmop.dll -;extension=php_snmp.dll -;extension=php_sockets.dll -;extension=php_sybase_ct.dll -;extension=php_tokenizer.dll -;extension=php_w32api.dll -;extension=php_xslt.dll -;extension=php_yaz.dll -;extension=php_zlib.dll - - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - -[Syslog] -; Whether or not to define the various syslog variables (e.g. $LOG_PID, -; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -; runtime, you can define these variables by calling define_syslog_variables(). -define_syslog_variables = Off - -[mail function] -; For Win32 only. -SMTP = localhost - -; For Win32 only. -sendmail_from = me@localhost.com - -; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -;sendmail_path = - -[Java] -;java.class.path = .\php_java.jar -;java.home = c:\jdk -;java.library = c:\jdk\jre\bin\hotspot\jvm.dll -;java.library.path = .\ - -[SQL] -sql.safe_mode = Off - -[ODBC] -;odbc.default_db = Not yet implemented -;odbc.default_user = Not yet implemented -;odbc.default_pw = Not yet implemented - -; Allow or prevent persistent links. -odbc.allow_persistent = On - -; Check that a connection is still valid before reuse. -odbc.check_persistent = On - -; Maximum number of persistent links. -1 means no limit. -odbc.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -odbc.max_links = -1 - -; Handling of LONG fields. Returns number of bytes to variables. 0 means -; passthru. -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 - -[MySQL] -; Allow or prevent persistent links. -mysql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mysql.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -mysql.max_links = -1 - -; Default port number for mysql_connect(). If unset, mysql_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -mysql.default_port = - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysql.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysql.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysql.default_user = - -; Default password for mysql_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo cfg_get_var("mysql.default_password") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysql.default_password = - -[mSQL] -; Allow or prevent persistent links. -msql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -msql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -msql.max_links = -1 - -[PostgresSQL] -; Allow or prevent persistent links. -pgsql.allow_persistent = On - -; Detect broken persistent links always with pg_pconnect(). Need a little overhead. -pgsql.auto_reset_persistent = Off - -; Maximum number of persistent links. -1 means no limit. -pgsql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -pgsql.max_links = -1 - -[Sybase] -; Allow or prevent persistent links. -sybase.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybase.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybase.max_links = -1 - -;sybase.interface_file = "@prefix@/sybase/interfaces" - -; Minimum error severity to display. -sybase.min_error_severity = 10 - -; Minimum message severity to display. -sybase.min_message_severity = 10 - -; Compatability mode with old versions of PHP 3.0. -; If on, this will cause PHP to automatically assign types to results according -; to their Sybase type, instead of treating them all as strings. This -; compatability mode will probably not stay around forever, so try applying -; whatever necessary changes to your code, and turn it off. -sybase.compatability_mode = Off - -[Sybase-CT] -; Allow or prevent persistent links. -sybct.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybct.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybct.max_links = -1 - -; Minimum server message severity to display. -sybct.min_server_severity = 10 - -; Minimum client message severity to display. -sybct.min_client_severity = 10 - -[bcmath] -; Number of decimal digits for all bcmath functions. -bcmath.scale = 0 - -[browscap] -;browscap = extra/browscap.ini - -[Informix] -; Default host for ifx_connect() (doesn't apply in safe mode). -ifx.default_host = - -; Default user for ifx_connect() (doesn't apply in safe mode). -ifx.default_user = - -; Default password for ifx_connect() (doesn't apply in safe mode). -ifx.default_password = - -; Allow or prevent persistent links. -ifx.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -ifx.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -ifx.max_links = -1 - -; If on, select statements return the contents of a text blob instead of its id. -ifx.textasvarchar = 0 - -; If on, select statements return the contents of a byte blob instead of its id. -ifx.byteasvarchar = 0 - -; Trailing blanks are stripped from fixed-length char columns. May help the -; life of Informix SE users. -ifx.charasvarchar = 0 - -; If on, the contents of text and byte blobs are dumped to a file instead of -; keeping them in memory. -ifx.blobinfile = 0 - -; NULL's are returned as empty strings, unless this is set to 1. In that case, -; NULL's are returned as string 'NULL'. -ifx.nullformat = 0 +; Include Paths +;include_path = ".:/kolab/lib/php" +include_path = ".:@phplibdir@:@phplibdir2@:@phppeardir@" +safe_mode_include_dir = "/kolab/lib/php" [Session] -; Handler used to store/retrieve data. -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 -; variable in order to use PHP's session functions. session.save_path = @webserver_sessions@ - -; Whether to use cookies. -session.use_cookies = 1 - - -; Name of the session (used as cookie name). -session.name = PHPSESSID - -; Initialize session on request startup. -session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. -session.cookie_lifetime = 0 - -; The path for which the cookie is valid. -session.cookie_path = / - -; The domain for which the cookie is valid. -session.cookie_domain = - -; Handler used to serialize data. php is the standard serializer of PHP. -session.serialize_handler = php - -; Percentual probability that the 'garbage collection' process is started -; on every session initialization. -session.gc_probability = 1 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. -session.gc_maxlifetime = 1440 - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. -session.referer_check = - -; How many bytes to read from the file. -session.entropy_length = 0 - -; Specified here to create the session id. -session.entropy_file = - -;session.entropy_length = 16 - -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public} to determine HTTP caching aspects. -session.cache_limiter = nocache - -; Document expires after n minutes. -session.cache_expire = 180 - -; trans sid support is disabled by default. -; 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. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. -session.use_trans_sid = On - -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -[MSSQL] -; Allow or prevent persistent links. -mssql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mssql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -mssql.max_links = -1 - -; Minimum error severity to display. -mssql.min_error_severity = 10 - -; Minimum message severity to display. -mssql.min_message_severity = 10 - -; Compatability mode with old versions of PHP 3.0. -mssql.compatability_mode = Off - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textlimit = 4096 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textsize = 4096 - -; Limits the number of records in each batch. 0 = all records in one batch. -;mssql.batchsize = 0 - -[Assertion] -; Assert(expr); active by default. -;assert.active = On - -; Issue a PHP warning for each failed assertion. -;assert.warning = On - -; Don't bail out by default. -;assert.bail = Off - -; User-function to be called if an assertion fails. -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -;assert.quiet_eval = 0 - -[Ingres II] -; Allow or prevent persistent links. -ingres.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -ingres.max_persistent = -1 - -; Maximum number of links, including persistents. -1 means no limit. -ingres.max_links = -1 - -; Default database (format: [node_id::]dbname[/srv_class]). -ingres.default_database = - -; Default user. -ingres.default_user = - -; Default password. -ingres.default_password = - -[Verisign Payflow Pro] -; Default Payflow Pro server. -pfpro.defaulthost = "test-payflow.verisign.com" - -; Default port to connect to. -pfpro.defaultport = 443 - -; Default timeout in seconds. -pfpro.defaulttimeout = 30 - -; Default proxy IP address (if required). -;pfpro.proxyaddress = - -; Default proxy port. -;pfpro.proxyport = - -; Default proxy logon. -;pfpro.proxylogon = - -; Default proxy password. -;pfpro.proxypassword = - -[Sockets] -; Use the system read() function instead of the php_read() wrapper. -sockets.use_system_read = On - -[com] -; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -;com.typelib_file = -; allow Distributed-COM calls -;com.allow_dcom = true -; autoregister constants of a components typlib on com_load() -;com.autoregister_typelib = true -; register constants casesensitive -;com.autoregister_casesensitive = false -; show warnings on duplicate constat registrations -;com.autoregister_verbose = true - -[Printer] -;printer.default_printer = "" - -[mbstring] -;mbstring.internal_encoding = EUC-JP -;mbstring.http_input = auto -;mbstring.http_output = SJIS -;mbstring.detect_order = auto -;mbstring.substitute_character = none; - -[FrontBase] -;fbsql.allow_persistent = On -;fbsql.autocommit = On -;fbsql.default_database = -;fbsql.default_database_password = -;fbsql.default_host = -;fbsql.default_password = -;fbsql.default_user = "_SYSTEM" -;fbsql.generate_warnings = Off -;fbsql.max_connections = 128 -;fbsql.max_links = 128 -;fbsql.max_persistent = -1 -;fbsql.max_results = 128 -;fbsql.batchSize = 1000 - -; Local Variables: -; tab-width: 4 -; End: diff --git a/kolabd/kolabd/templates/rc.conf.template.in b/kolabd/kolabd/templates/rc.conf.template.in --- a/kolabd/kolabd/templates/rc.conf.template.in +++ b/kolabd/kolabd/templates/rc.conf.template.in @@ -11,12 +11,6 @@ KOLAB_META_END # this file is automatically written by the Kolab config backend # manual additions are lost unless made to the template in the Kolab config directory -# Logfile corrections -apache_log_files="@webserver_accesslogfile@" -apache_err_files="@webserver_errorlogfile@" -imapd_master_file="@imap_masterlogfile@" -imapd_misc_file="@imap_misclogfile@" - openldap_url="ldap:// ldaps://" sasl_authmech="ldap"