merge heads

3 files changed, 181 insertions, 201 deletions

diff --git a/ChangeLog b/ChangeLog
index 4473a11..19a9abc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-09  Mathieu Parent <math.parent@gmail.com>
+
+	* templates/imapd.conf.template.in: Correct tls_ca_file path.
+	(http://bugs.debian.org/599033).
+
+2010-09-13  Gunnar Wrobel  <p@rdus.de>
+
+	* kolab.globals.in: 
+
+	Added kolab_php_smarty_prefix and smarty_compiledir.
+	Added phplibdir.
+	Added webserver_web_prefix.
+	Added RPM, kolab_pkgs, pear_horde_pkgs.
+
+	* templates/session_vars.php.template.in: 
+
+	removed in favor of the configuration template provided by the web
+	admin package.
+
 2010-08-23  Gunnar Wrobel  <p@rdus.de>
 
 	* kolab.globals.in:
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index ed2ad44..0faa343 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -6,6 +6,34 @@
 # below you can copy the setting to kolab.conf and edit it there.
 # This will override the default setting provided here.
 #=================================================================
+KOLABRC: @KOLABRC@
+LDAPD : @LDAPD@
+PHP : @PHP@
+RPM : @RPM@
+TAR : @TAR@
+WITHOPENPKG : @WITHOPENPKG@
+aliases_file : @aliases_file@
+amavisd_conffile : @amavisd_conffile@
+amavisd_grp : @amavisd_grp@
+amavisd_home : @amavisd_home@
+amavisd_logfile : @amavisd_logfile@
+amavisd_rusr : @amavisd_rusr@
+amavisd_templatedir : @amavisd_templatedir@
+amavisd_usr : @amavisd_usr@
+backupdir : @backupdir@
+backupfiles : @backupfiles@
+bind_addr : 0.0.0.0
+bind_any : TRUE
+bindir: @bindir@
+calendar_id : calendar
+clamav_confdir : @clamav_confdir@
+clamav_datadir : @clamav_datadir@
+clamav_grp : @clamav_grp@
+clamav_logfile : @clamav_logfile@
+clamav_pidfile : @clamav_pidfile@
+clamav_rusr : @clamav_rusr@
+clamav_socket : @clamav_socket@
+clamav_usr : @clamav_usr@
 conn_refresh_period : 60
 cyrus-admin : manager
 cyrus-admins : manager
@@ -15,20 +43,135 @@ cyrus-imaps : TRUE
 cyrus-pop3 : FALSE
 cyrus-pop3s : TRUE
 cyrus-sieve : TRUE
+debug : 0
+datadir : @datadir@
+dimp_confdir: @dimp_confdir@
 directory_mode : @directory_mode@
+emailserver_confdir : @emailserver_confdir@
+emailserver_default_privs : @emailserver_default_privs@
+emailserver_grp : @emailserver_grp@
+emailserver_localstatedir : @emailserver_localstatedir@
+emailserver_logfile : @emailserver_logfile@
+emailserver_mail_owner : @emailserver_mail_owner@
+emailserver_master_usr : @emailserver_master_usr@
+emailserver_musr : @emailserver_musr@
+emailserver_setgid_grp : @emailserver_setgid_grp@
+emailserver_socket : @emailserver_socket@
+emailserver_tables_usr : @emailserver_tables_usr@
+emailserver_usr : @emailserver_usr@
+freebusy_cachedir: @freebusy_cachedir@
+freebusy_confdir: @freebusy_confdir@
+freebusy_grp: @freebusy_grp@
+freebusy_log_name: @freebusy_log_name@
+freebusy_log_type: @freebusy_log_type@
+freebusy_logdir: @freebusy_logdir@
+freebusy_usr: @freebusy_usr@
+freshclam_logfile : @freshclam_logfile@
+freshclam_pidfile : @freshclam_pidfile@
+graveyard_tscache: @graveyard_tscache@
+graveyard_uidcache: @graveyard_uidcache@
 gyard_deletion_period : 10080
+hashmethod: @sbindir@/slappasswd -s
+horde_confdir: @horde_confdir@
+horde_cookie_path: @horde_cookie_path@
+imap_confdir : @imap_confdir@
+imap_confperm : @imap_confperm@
+imap_grp : @imap_grp@
+imap_lmtp : @imap_lmtp@
+imap_masterlogfile : @imap_masterlogfile@
+imap_misclogfile : @imap_misclogfile@
+imap_notify_socket : @imap_notify_socket@
+imap_sievedir : @imap_sievedir@
+imap_spool : @imap_spool@
+imap_statedir : @imap_statedir@
+imap_usr : @imap_usr@
+imappartitions_script : @sbindir@/kolab_imappartitions
+imp_confdir: @imp_confdir@
+ingo_confdir: @ingo_confdir@
+kolab_cafile: @sysconfdir@/kolab/kolabserver-ca.crt
+kolab_grp: @kolab_grp@
+kolab_hooksdir: @kolab_hooksdir@
+kolab_locals: @sysconfdir@/kolab/kolab.conf
+kolab_mailboxuiddb: @kolab_mailboxuiddb@
+kolab_mgrp: @kolab_mgrp@
+kolab_musr: @kolab_musr@
+kolab_php_module_prefix : @kolab_php_module_prefix@
+kolab_php_smarty_prefix : @kolab_php_smarty_prefix@
+kolab_pidfile: @kolab_pidfile@
+kolab_pkgs : @kolab_pkgs@
+kolab_quotawarning: @kolab_quotawarning@
+kolab_rgrp: @kolab_rgrp@
+kolab_rusr: @kolab_rusr@
+kolab_scriptsdir : @kolab_scriptsdir@
+kolab_smtpdpolicy_conffile_grp : @kolab_smtpdpolicy_conffile_grp@
+kolab_smtpdpolicy_conffile_usr : @kolab_smtpdpolicy_conffile_usr@
+kolab_statedir: @kolab_statedir@
+kolab_susr: @kolab_susr@
+kolab_usr: @kolab_usr@
+kolab_wui : @kolab_wui@
+kolabconf_script: @kolabconf_script@
+kolabdir: @sysconfdir@/kolab/
+kronolith_confdir: @kronolith_confdir@
 ldap_uri : ldap://127.0.0.1:389
+ldapserver_argsfile : @ldapserver_argsfile@
+ldapserver_confdir : @ldapserver_confdir@
+ldapserver_dir : @ldapserver_dir@
+ldapserver_grp : @ldapserver_grp@
+ldapserver_logfile : @ldapserver_logfile@
+ldapserver_modulepath : @ldapserver_modulepath@
+ldapserver_pidfile : @ldapserver_pidfile@
+ldapserver_replogfile : @ldapserver_replogfile@
+ldapserver_rgrp : @ldapserver_rgrp@
+ldapserver_rusr : @ldapserver_rusr@
+ldapserver_schemadir : @ldapserver_schemadir@
+ldapserver_statedir : @ldapserver_statedir@
+ldapserver_usr : @ldapserver_usr@
+ldapserverslurpd_pidfile : @ldapserverslurpd_pidfile@
+libdir : @libdir@
+libexecdir : @libexecdir@
+local_addr : 127.0.0.1
+localstatedir : @localstatedir@
 log_level : 2
-debug : 0
+mimp_confdir: @mimp_confdir@
+mnemo_confdir: @mnemo_confdir@
+nag_confdir: @nag_confdir@
+passwd_confdir: @passwd_confdir@
+pear_horde_pkgs : @pear_horde_pkgs@
+phpini_dir : @phpini_dir@
+phplibdir : @phplibdir@
+phplibdir2 : @phplibdir2@
+pki_grp : @pki_grp@
 postfix-mydestination : $mydomain
+prefix : @prefix@
+resmgr_confdir: @resmgr_confdir@
+resmgr_conffile_grp: @resmgr_conffile_grp@
+resmgr_conffile_usr: @resmgr_conffile_usr@
+resmgr_localedir: @resmgr_localedir@
+resmgr_locksdir: @resmgr_locksdir@
+resmgr_log_name: @resmgr_log_name@
+resmgr_log_type: @resmgr_log_type@
+resmgr_logdir: @resmgr_logdir@
+resmgr_scriptsdir : @resmgr_scriptsdir@
+resmgr_tmpdir: @resmgr_tmpdir@
+sasl_authdconffile : @sasl_authdconffile@
+sasl_logfile : @sasl_logfile@
+sasl_smtpconffile : @sasl_smtpconffile@
+sbindir: @sbindir@
 sf_field_deleted : kolabdeleteflag
 sf_field_guid : entryUUID
 sf_field_modified : modifytimestamp
 sf_field_quota : cyrus-userquota
 sf_object_class : kolabsharedfolder
-slurpd_addr : 127.0.0.1
 slurpd_accept_addr : 127.0.0.1
+slurpd_addr : 127.0.0.1
 slurpd_port : 9999
+smarty_compiledir : @smarty_compiledir@
+spamassassin_confdir : @spamassassin_confdir@
+syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie
+sysconfdir : @sysconfdir@
+syslog_facility : @syslog_facility@
+templatedir: @sysconfdir@/kolab/templates
+turba_confdir: @turba_confdir@
 uid : freebusy
 userPassword : freebusy
 user_field_deleted : kolabdeleteflag
@@ -36,88 +179,21 @@ user_field_guid : entryUUID
 user_field_modified : modifytimestamp
 user_field_quota : cyrus-userquota
 user_object_class : inetOrgPerson
-kolabconf_script: @kolabconf_script@
-kolab_locals: @sysconfdir@/kolab/kolab.conf
-kolab_usr: @kolab_usr@
-kolab_grp: @kolab_grp@
-kolab_rusr: @kolab_rusr@
-kolab_rgrp: @kolab_rgrp@
-kolab_musr: @kolab_musr@
-kolab_mgrp: @kolab_mgrp@
-kolab_susr: @kolab_susr@
-kolab_hooksdir: @kolab_hooksdir@
-kolab_quotawarning: @kolab_quotawarning@
-hashmethod: @sbindir@/slappasswd -s
-templatedir: @sysconfdir@/kolab/templates
-kolabdir: @sysconfdir@/kolab/
-kolab_cafile: @sysconfdir@/kolab/kolabserver-ca.crt
-KOLABRC: @KOLABRC@
-bindir: @bindir@
-sbindir: @sbindir@
-webserver_logdir: @webserver_logdir@
-webserver_document_root: @webserver_document_root@
-webserver_musr: @webserver_musr@
-webserver_usr: @webserver_usr@
-webserver_grp: @webserver_grp@
 webclient_data_root: @webclient_data_root@
-horde_cookie_path: @horde_cookie_path@
-horde_confdir: @horde_confdir@
-dimp_confdir: @dimp_confdir@
-ingo_confdir: @ingo_confdir@
-imp_confdir: @imp_confdir@
-kronolith_confdir: @kronolith_confdir@
-mimp_confdir: @mimp_confdir@
-mnemo_confdir: @mnemo_confdir@
-nag_confdir: @nag_confdir@
-passwd_confdir: @passwd_confdir@
-turba_confdir: @turba_confdir@
-kolab_statedir: @kolab_statedir@
-kolab_pidfile: @kolab_pidfile@
-kolab_mailboxuiddb: @kolab_mailboxuiddb@
-graveyard_uidcache: @graveyard_uidcache@
-graveyard_tscache: @graveyard_tscache@
-local_addr : 127.0.0.1
-bind_any : TRUE
-bind_addr : 0.0.0.0
-calendar_id : calendar
-syslog_facility : @syslog_facility@
-backupfiles : @backupfiles@
-backupdir : @backupdir@
-sysconfdir : @sysconfdir@
-sasl_smtpconffile : @sasl_smtpconffile@
-ldapserver_dir : @ldapserver_dir@
-ldapserver_confdir : @ldapserver_confdir@
-ldapserver_statedir : @ldapserver_statedir@
-ldapserver_rusr : @ldapserver_rusr@
-ldapserver_grp : @ldapserver_grp@
-ldapserver_rgrp : @ldapserver_rgrp@
-ldapserver_modulepath : @ldapserver_modulepath@
-libexecdir : @libexecdir@
-WITHOPENPKG : @WITHOPENPKG@
-LDAPD : @LDAPD@
-kolab_scriptsdir : @kolab_scriptsdir@
-pki_grp : @pki_grp@
-TAR : @TAR@
-syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie
-imap_confdir : @imap_confdir@
-imappartitions_script : @sbindir@/kolab_imappartitions
-freebusy_confdir: @freebusy_confdir@
-freebusy_usr: @freebusy_usr@
-freebusy_grp: @freebusy_grp@
-freebusy_log_type: @freebusy_log_type@
-freebusy_log_name: @freebusy_log_name@
-freebusy_logdir: @freebusy_logdir@
-freebusy_cachedir: @freebusy_cachedir@
-resmgr_confdir: @resmgr_confdir@
-resmgr_conffile_usr: @resmgr_conffile_usr@
-resmgr_conffile_grp: @resmgr_conffile_grp@
-resmgr_tmpdir: @resmgr_tmpdir@
-resmgr_localedir: @resmgr_localedir@
-resmgr_locksdir: @resmgr_locksdir@
-resmgr_logdir: @resmgr_logdir@
-resmgr_log_type: @resmgr_log_type@
-resmgr_log_name: @resmgr_log_name@
-kolab_wui : @kolab_wui@
-kolab_php_module_prefix : @kolab_php_module_prefix@
-prefix : @prefix@
-phplibdir2 : @phplibdir2@
+webserver_acceptlock : @webserver_acceptlock@
+webserver_accesslogfile : @webserver_accesslogfile@
+webserver_cgidir : @webserver_cgidir@
+webserver_confdir : @webserver_confdir@
+webserver_document_root : @webserver_document_root@
+webserver_errorlogfile : @webserver_errorlogfile@
+webserver_grp : @webserver_grp@
+webserver_logdir : @webserver_logdir@
+webserver_musr : @webserver_musr@
+webserver_pidfile : @webserver_pidfile@
+webserver_runtime_status : @webserver_runtime_status@
+webserver_sessions : @webserver_sessions@
+webserver_sslmutex : @webserver_sslmutex@
+webserver_sslscache : @webserver_sslscache@
+webserver_tmpdir : @webserver_tmpdir@
+webserver_usr : @webserver_usr@
+webserver_web_prefix : @webserver_web_prefix@
diff --git a/kolabd.spec.in b/kolabd.spec.in
deleted file mode 100644
index adace9e..0000000
--- a/kolabd.spec.in
+++ /dev/null
@@ -1,115 +0,0 @@
-##
-##  kolabd.spec -- OpenPKG RPM Specification
-##  Copyright (c) 2004-2005 Klaraelvdalens Datakonsult AB <http://www.klaralvdalens-datakonsult.se>
-##  Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
-##  Copyright (c) 2000-2004 Ralf S. Engelschall <rse@engelschall.com>
-##  Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
-##
-##  Permission to use, copy, modify, and distribute this software for
-##  any purpose with or without fee is hereby granted, provided that
-##  the above copyright notice and this permission notice appear in all
-##  copies.
-##
-##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-##  SUCH DAMAGE.
-##
-
-#   package information
-Name:         kolabd
-Summary:      Kolab2 Groupware Server Daemon
-URL:          http://www.kolab.org/
-Vendor:       Erfrakon, Intevation, Code Fusion, Klaraelvdalens Datakonsult AB
-Packager:     Klaraelvdalens Datakonsult AB
-Distribution: OpenPKG
-Group:        Mail
-License:      GPL
-Version:      @VERSION@
-Release:      @spec_build_date@
-
-#   list of sources
-Source0:      kolabd-%{version}.tar.bz2
-#Source1:      rc.kolabd
-
-#   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20070603
-PreReq:       OpenPKG, openpkg >= 20070603
-
-PreReq:       postfix, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
-PreReq:       sasl::with_ldap = yes, sasl::with_login = yes
-PreReq:       amavisd
-PreReq:       clamav >= 0.90
-PreReq:       openldap, openldap::with_pth = no
-PreReq:       imap, imap::with_annotate = yes
-PreReq:       apache, apache::with_mod_ssl = yes, apache::with_mod_ldap = yes, apache::with_mod_authn_alias = yes
-PreReq:       Kolab_Filter
-PreReq:       Kolab_FreeBusy
-
-# what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_json = yes, php::with_tokenizer = yes
-PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes
-
-PreReq:       imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
-PreReq:       perl-ssl
-PreReq:       perl-www
-PreReq:       perl-ldap
-PreReq:       perl-kolab >= 2.2.1-20090317
-AutoReq:      no
-AutoReqProv:  no
-
-Provides:     kolabd::with_horde
-
-%option       kolab_version snapshot
-
-%description
-    Kolab is the KDE Groupware Server that provides full groupware
-    features to either KDE Kolab clients or Microsoft Outlook[tm]
-    clients using third party plugins and web clients in the future. 
-    In addition it is a robust and flexible general IMAP mail server 
-    with LDAP addressbooks.
-
-%prep
-    %setup -q
-
-%build
-    ./configure --prefix=%{l_prefix} --with-dist=kolab
-    %{l_make} %{l_mflags}
-
-%install
-
-    #   install package
-    %{l_make} %{l_mflags} install \
-        DESTDIR=$RPM_BUILD_ROOT
-
-    #   generate file list
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-	'%config %{l_prefix}/etc/kolab/templates/*.template' \
-	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \
-	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/php
-
-%files -f files
-
-%clean
-    rm -rf $RPM_BUILD_ROOT
-
-%post
-    %{l_shtool} echo -e "Installing crontab entry"
-	# NOTE: OpenPKG's dcron package does not work currently, 
-	# so we have to rely on the host system's cron:
-    %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v '%{l_prefix}/[a-z/]*/kolabquotawarn'`" \
-	| crontab - -u %{l_musr}
-
-    echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/sbin/kolab_bootstrap -b' as user root."
-    echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."
-    echo "In every case execute '$RPM_INSTALL_PREFIX/bin/openpkg rc kolabd restart' as user root."