8 commits - Installation_Guide/default configuration files Installation_Guide/en-US

Christian Mollekopf mollekopf at kolabsys.com
Fri Jul 1 15:24:58 CEST 2011


 Installation_Guide/default                                        |  254 +
 Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml |   11 
 Installation_Guide/en-US/Kolab_Server_Installation.xml            | 1448 +++++-----
 3 files changed, 989 insertions(+), 724 deletions(-)

New commits:
commit e0d1860ac30085f49a4e69a2094d709184451335
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 15:24:22 2011 +0200

    slapd.conf docs + singleserver install

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 3d3b954..5523e46 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -731,14 +731,35 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
         </section>
 
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_LDAP_component">
-            <title>Installation of the Kolab-LDAP component</title>
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Full_default_installation_on_a_single_server">
+            <title>Full default installation on a single server</title>
+            <para>
+                If you want a default installation of a components on a single server, pleas run:
+<screen># <userinput>yum install kolab-groupware-server</userinput></screen>
+                This will install all needed components.
+            </para>
+            <para>
+                Once the installation is complete, you can configure all components using:
+<screen># <userinput>/opt/kolab/bin/kolab-setup</userinput></screen>
+
+            </para>
+            <para>
+                If you ran the script successfully the installation and configuration of the server is complete and you can move on to the next chapter.
+            </para>
+            <para>
+                Alternatively you can install each component individually, which will give you the same result.
+            </para>
+
+        </section>
+
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_LDAP">
+            <title>Installation of LDAP</title>
             <para>
                 For a default installation with <application>OpenLDAP</application>use:
 <screen># <userinput>yum install kolab-ldap</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_LDAP_component-Configuration">
+            <section id="sect-Installation_Guide-Installation_of_LDAP-Configuration">
                 <title>Configuration</title>
                 <para>
                     To configure the LDAP component, please run the provided configuration script:
@@ -746,20 +767,34 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
                 </para>
                 <para>
-                    If you ran the script successfuly you can move on to the next component.
+                    If you ran the script successfully you can move on to the next component.
                 </para>
                 <para>
                     Alternatively you may manually configure the following set of minimum values:
                 </para>
                 <para>
-                    <filename>/etc/openldap/ldap.conf</filename>
+                    <filename>/etc/openldap/slapd.conf</filename>
+                </para>
+                <para>
+                    Update all example.com domains.
                 </para>
-                <blockquote id="bloc-Installation_Guide-Configuration-bind_addr">
-                    <title>bind_addr</title>
+                <blockquote id="bloc-Installation_Guide-Configuration-certificates">
+                    <title>certificates</title>
+
+<screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/slapd.cert</replaceable></screen>
+
+<screen>TLSCertificateKeyFile <replaceable>/etc/pki/tls/certs/slapd.pem</replaceable></screen>
+                    <para>
+
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-rootDSE">
+                    <title>rootDSE</title>
 
-<screen>bind_addr <replaceable>0.0.0.0</replaceable></screen>
+<screen>rootDSE <replaceable>/etc/rootDSE.ldif</replaceable></screen>
                     <para>
-                        The IP on which the server listens.
+                        Specify the name of an LDIF(5) file containing user defined attributes for the root DSE. These attributes are returned in addition to the attributes normally produced by slapd.
                     </para>
 
                 </blockquote>
@@ -799,7 +834,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
                 </para>
                 <para>
-                    If you ran the script successfuly you can move on to the next component.
+                    If you ran the script successfully you can move on to the next component.
                 </para>
                 <para>
                     Alternatively you may manually configure the following set of minimum values:


commit d246aa8db96616b8a9bfbf115e917fe1214e6796
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 14:39:04 2011 +0200

    added ldap default configs

diff --git a/Installation_Guide/default configuration files/ldap.conf b/Installation_Guide/default configuration files/ldap.conf
new file mode 100644
index 0000000..679cc64
--- /dev/null
+++ b/Installation_Guide/default configuration files/ldap.conf	
@@ -0,0 +1,16 @@
+#
+# LDAP Defaults
+#
+
+# See ldap.conf(5) for details
+# This file should be world readable but not world writable.
+
+#BASE   dc=example, dc=com
+#URI    ldap://ldap.example.com ldap://ldap-master.example.com:666
+
+#SIZELIMIT      12
+#TIMELIMIT      15
+#DEREF          never
+
+# This is required for Kolab to work with self-signed certs.
+TLS_REQCERT     allow 
diff --git a/Installation_Guide/default configuration files/slapd.access b/Installation_Guide/default configuration files/slapd.access
new file mode 100644
index 0000000..4f2d4b8
--- /dev/null
+++ b/Installation_Guide/default configuration files/slapd.access	
@@ -0,0 +1,21 @@
+# Domain ACL statements for inclusion in slapd.conf
+# Access to domain groups
+access to dn.children="cn=domains,cn=internal,dc=example,dc=org"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read
+        by group/kolabGroupOfNames="cn=example.org,cn=domains,cn=internal,dc=example,dc=org" read
+         by * search stop
+# Domain specific access
+access to filter=(&(objectClass=kolabInetOrgPerson)(mail=*@example.org)(|(!(alias=*))(alias=*@example.org)))
+        by group/kolabGroupOfNames="cn=example.org,cn=domains,cn=internal,dc=example,dc=org" write
+        by * break
+
+access to filter=(&(objectClass=kolabGroupOfNames)(mail=*@example.org))
+        by group/kolabGroupOfNames="cn=example.org,cn=domains,cn=internal,dc=example,dc=org" write
+        by * break
+
+access to filter=(&(objectClass=kolabSharedFolder)(cn=*@example.org))
+        by group/kolabGroupOfNames="cn=example.org,cn=domains,cn=internal,dc=example,dc=org" write
+        by * break
+ 
diff --git a/Installation_Guide/default configuration files/slapd.conf b/Installation_Guide/default configuration files/slapd.conf
new file mode 100644
index 0000000..62247af
--- /dev/null
+++ b/Installation_Guide/default configuration files/slapd.conf	
@@ -0,0 +1,213 @@
+# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+# (c) 2003-2007 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.
+
+
+modulepath     /usr/lib64/openldap
+moduleload     refint
+moduleload     unique
+
+include /etc/openldap/schema/core.schema
+include /etc/openldap/schema/cosine.schema
+include /etc/openldap/schema/inetorgperson.schema
+include /etc/openldap/schema/kolab2.schema
+
+# Only include this in case you need the calFBURL attribute in
+# kolabInetOrgPerson objects.
+# see also kolab/issue3245 (https://issues.kolab.org/issue3245)
+#
+# The schema remains available at
+# /kolab/var/kolab/www/client/turba/scripts/ldap/rfc2739.schema
+#include /etc/openldap/schema/rfc2739.schema
+
+# Only include this in case you want to store the preferences of the
+# kolab web client in LDAP.
+# see also kolab/issue3245 (https://issues.kolab.org/issue3245)
+#
+# The schema remains available at
+# /kolab/var/kolab/www/client/scripts/ldap/horde.schema
+#include /etc/openldap/schema/horde.schema
+
+pidfile         /var/run/openldap/slapd.pid
+argsfile        /var/run/openldap/slapd.args
+
+replica-pidfile /var/run/openldap/slurpd.pid
+replogfile      /var/lib/ldap/replog
+replicationinterval 5
+
+TLSCertificateFile     /etc/pki/tls/certs/slapd.cert
+TLSCertificateKeyFile  /etc/pki/tls/certs/slapd.pem
+
+rootDSE                /etc/kolab/rootDSE.ldif
+
+defaultsearchbase      "dc=example,dc=org"
+
+#require        none
+allow           bind_v2
+
+loglevel        none
+
+database        bdb
+suffix          "dc=example,dc=org"
+cachesize       10000
+checkpoint      512 5
+idlcachesize    10000
+
+# The idletimeout can be increased if some clients develop problems.
+# Please report to kolab-devel at kolab.org if you encounter such a client.
+idletimeout     300
+
+
+dirtyread
+
+directory       /var/lib/ldap
+
+rootdn          "cn=manager,cn=internal,dc=example,dc=org"
+rootpw          "{SSHA}M5rxZD9PoBK33r7vlUufooUoIKLD7bkS"
+
+replica uri=ldap://127.0.0.1:9999
+        binddn="cn=replicator"
+        bindmethod=simple 
+        credentials=secret
+
+#### Using overlays to improve data consistency
+# Ensure that we never get dangling member attributes
+# Checked on rename and delete
+overlay refint
+refint_attributes member
+
+# The mail and the uid attribute must be unique.
+overlay unique
+unique_attributes mail uid
+
+index   objectClass     pres,eq
+index   uid             approx,sub,pres,eq
+index   mail            approx,sub,pres,eq
+index   alias           approx,sub,pres,eq
+index   cn              approx,sub,pres,eq
+index   sn              approx,sub,pres,eq
+index   givenName       approx,sub,pres,eq
+index   kolabDelegate   approx,sub,pres,eq
+index   kolabHomeServer pres,eq
+index   kolabDeleteflag pres,eq
+index   member          pres,eq
+
+include /etc/openldap/slapd.access
+
+access to dn="dc=example,dc=org" attrs=children
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,dc=example,dc=org" write
+
+access to dn="cn=internal,dc=example,dc=org" attrs=children
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,dc=example,dc=org" write
+
+access to attrs=userPassword
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" =wx
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" =wx
+        by self =wx
+        by anonymous =x
+        by * none stop
+
+access to attrs=mail
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+access to attrs=alias
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+access to attrs=uid
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+access to attrs=cyrus-userquota
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by self read stop
+
+access to attrs=kolabHomeServer
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+access to attrs=kolabHomeMTA
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+access to attrs=kolabAllowSMTPRecipient
+       by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+       by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+       by dn="cn=nobody,cn=internal,dc=example,dc=org" read
+       by self read stop
+
+access to dn="cn=nobody,dc=example,dc=org"
+        by anonymous auth stop
+
+access to dn="cn=manager,cn=internal,dc=example,dc=org"
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read
+        by self write
+        by anonymous auth stop
+
+access to dn="cn=admin,cn=internal,dc=example,dc=org"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read
+        by self write
+        by anonymous auth stop
+
+access to dn="cn=maintainer,cn=internal,dc=example,dc=org"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" read
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read
+        by self write
+        by anonymous auth stop
+
+access to dn.regex="(.*,)?cn=internal,dc=example,dc=org"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by self write
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read 
+        by anonymous auth stop
+
+access to dn.regex="(.*,)?cn=external,dc=example,dc=org"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+access to dn="cn=external,dc=example,dc=org"
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read 
+        by * search stop
+
+access to dn="cn=internal,dc=example,dc=org"
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read 
+        by * search stop
+
+access to dn="k=kolab,dc=example,dc=org"
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" read
+        by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,dc=example,dc=org" read
+        by dn="cn=nobody,cn=internal,dc=example,dc=org" read 
+        by * none stop
+
+access to * 
+        by self write
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by group/kolabGroupOfNames="cn=maintainer,cn=internal,dc=example,dc=org" write
+        by * read stop
+
+include /etc/openldap/slapd.replicas
+
+
+database        monitor
+
+access to *
+        by group/kolabGroupOfNames="cn=admin,cn=internal,dc=example,dc=org" write
+        by * none stop


commit 70a90b0c86fc9ed7b835787a46c824909304a52a
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 14:37:17 2011 +0200

    example.com is enough

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 32404ef..3d3b954 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -810,7 +810,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                 <blockquote id="bloc-Installation_Guide-Configuration-servername">
                     <title>servername</title>
 
-<screen>servername:   <replaceable>somehost.example.com</replaceable></screen>
+<screen>servername:   <replaceable>example.com</replaceable></screen>
                     <para>
                         This is the hostname visible in the greeting messages of the POP, IMAP and LMTP daemons. If it is unset, then the result returned from gethostname(2) is used.
                     </para>


commit 8d596703f6973c20b613f121b9003f6f1469aa4f
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 12:57:28 2011 +0200

    adapted docs to default configuration file

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index ae93416..32404ef 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -805,65 +805,6 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     Alternatively you may manually configure the following set of minimum values:
                 </para>
                 <para>
-                    <filename>/etc/cyrus.conf</filename>
-                </para>
-
-<screen>
-            # standard standalone server implementation
-
-START {
-    # do not delete this entry!
-    recover    cmd="ctl_cyrusdb -r"
-
-    # this is only necessary if using idled for IMAP IDLE
-    idled    cmd="idled"
-}
-
-SERVICES {
-    # The following lines enable the frontend server to proxy connections
-    # to the appropriate backend server.
-    #
-    imap        cmd="proxyd"        listen="imap"                        prefork=5
-    imaps    cmd="proxyd -s"    listen="imaps"                        prefork=5
-
-    # The frontend servers need to communicate about where the backend servers
-    # are, since they contain the mailboxes.
-    #
-    mupdate    cmd="mupdate"    listen=3905                            prefork=1
-    ptloader    cmd="ptloader"    listen="/var/lib/imap/ptclient/ptsock"  prefork=0
-
-    sievefilter cmd="timsieved"    listen=sievefilter                    prefork=0
-    sieve    cmd="timsieved"    listen=sieve                            prefork=0
-}
-
-
-EVENTS {
-    # This is required
-    checkpoint  cmd="ctl_cyrusdb -c" period=30
-
-    # this is only necessary if caching TLS sessions
-    tlsprune    cmd="tls_prune" at=0500
-}
-</screen>
-                <blockquote id="bloc-Installation_Guide-Configuration-bind_addr">
-                    <title>bind_addr</title>
-
-<screen>bind_addr <replaceable>0.0.0.0</replaceable></screen>
-                    <para>
-                        The IP on which the server listens.
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-lmtp">
-                    <title>lmtp</title>
-
-<screen>lmtp        cmd="lmtpd -a" listen="<replaceable>127.0.0.1:2003</replaceable>"</screen>
-                    <para>
-                        The address on which the mta runs on.
-                    </para>
-
-                </blockquote>
-                <para>
                     <filename>/etc/imapd.conf</filename>
                 </para>
                 <blockquote id="bloc-Installation_Guide-Configuration-servername">
@@ -887,21 +828,12 @@ EVENTS {
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-ldap_uri">
-                    <title>ldap_uri</title>
-
-<screen>ldap_uri:   <replaceable>ldap://127.0.0.1:389</replaceable></screen>
-                    <para>
-                        The address where the LDAP server runs on.
-                    </para>
-
-                </blockquote>
                 <blockquote id="bloc-Installation_Guide-Configuration-ldap_base">
                     <title>ldap_base</title>
 
 <screen>ldap_base:    <replaceable>dc=test90,dc=kolabsys,dc=com</replaceable></screen>
                     <para>
-                        ?
+                        Contains the LDAP base dn for the LDAP ptloader module
                     </para>
 
                 </blockquote>
@@ -910,19 +842,56 @@ EVENTS {
 
 <screen>ldap_bind_dn:    <replaceable>cn=nobody,cn=internal,dc=test90,dc=kolabsys,dc=com</replaceable></screen>
                     <para>
-                        ?
+                        Bind DN for the connection to the LDAP server (simple bind). Do not use for anonymous simple binds
                     </para>
 
                 </blockquote>
                 <blockquote id="bloc-Installation_Guide-Configuration-ldap_password">
                     <title>ldap_password</title>
 
-<screen>ldap_password:    <replaceable>WGonldcL43+MrvhulpU9XloeQ/1VBJhjtRZQX+F7</replaceable></screen>
+<screen>ldap_password:    <replaceable>LDAPpassword</replaceable></screen>
                     <para>
                         Password for the LDAP server.
                     </para>
 
                 </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-ldap_group_base">
+                    <title>ldap_group_base</title>
+
+<screen>ldap_group_base:    <replaceable>ou=Groups,dc=test90,dc=kolabsys,dc=com</replaceable></screen>
+                    <para>
+                        LDAP base dn for ldap_group_filter.
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-ldap_member_base">
+                    <title>ldap_member_base</title>
+
+<screen>ldap_member_base:    <replaceable>ou=People,dc=test90,dc=kolabsys,dc=com</replaceable></screen>
+                    <para>
+                        LDAP base dn for ldap_member_filter.
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-tls_cert">
+                    <title>tls_cert</title>
+
+<screen>tls_cert_file:    <replaceable>/etc/pki/tls/certs/test90-3.test90.kolabsys.com.crt</replaceable></screen>
+                    <para>
+                        File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS. TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
+                    </para>
+
+<screen>tls_key_file:    <replaceable>/etc/pki/tls/private/test90-3.test90.kolabsys.com.key</replaceable></screen>
+                    <para>
+                        File containing the private key belonging to the server certificate. A value of "disabled" will disable SSL/TLS.
+                    </para>
+
+<screen>tls_ca_file:    <replaceable>/etc/pki/tls/certs/kolab_ca.crt</replaceable></screen>
+                    <para>
+                        File containing one or more Certificate Authority (CA) certificates.
+                    </para>
+
+                </blockquote>
                 <para>
                     TODO: move this to admin guide, on installation the service is not running yet After you have finished the configuration, plase restart the service using:
 <screen># <userinput>/etc/rc.d/init.d/cyrus-imapd restart</userinput></screen>


commit ef7cba69d9c42198236909bae0710a2e7b754087
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 12:57:06 2011 +0200

    updated defaults of imapd.conf

diff --git a/Installation_Guide/default configuration files/imapd.conf b/Installation_Guide/default configuration files/imapd.conf
index 656e342..95dbb83 100644
--- a/Installation_Guide/default configuration files/imapd.conf	
+++ b/Installation_Guide/default configuration files/imapd.conf	
@@ -11,12 +11,12 @@ allowplaintext: 0
 auth_mech: pts
 pts_module: ldap
 
-ldap_servers: ldap://ldap.test90.kolabsys.com
+ldap_servers: ldap://127.0.0.1:389
 ldap_sasl: 0
 ldap_base: dc=test90,dc=kolabsys,dc=com
 ldap_bind_dn: uid=kolab-anonymous,ou=Special Users,dc=test90,dc=kolabsys,dc=com
 ldap_password: Welcome2KolabSystems
-ldap_filter: (|(&(|(uid=cyrus-admin)(uid=cyrus-murder))(uid=%U))(&(|(uid=%U)(mail=%U@%d)(mail=%U@%r))(objectclass=kolabinetorgperson)(!(nsroledn=cn=nsmanageddisabledrole,dc=test90,dc=kolabsys,dc=com))))
+ldap_filter: (|(&(|(uid=cyrus-admin)(uid=cyrus-murder))(uid=%U))(&(|(uid=%U)(mail=%U@%d)(mail=%U@%r))(objectclass=kolabinetorgperson)))
 ldap_group_base: ou=Groups,dc=test90,dc=kolabsys,dc=com
 ldap_group_filter: (cn=%u)
 ldap_member_base: ou=People,dc=test90,dc=kolabsys,dc=com


commit 097d32fe05c1dd7c7b3608043d51bfd4beb1e108
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 12:02:14 2011 +0200

    Some refactoring

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index ec0fa65..ae93416 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -4,317 +4,317 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Installation_Guide-Kolab_Server">
-	<title>Kolab Server</title>
-	 <para>
-		The Kolab server is built out of the best available Free and Open Source software components, most if not all of which are available through the Linux distribution of your preference. However, such Linux distribution may not be as up-to-date as one might wish for the Kolab Groupware to provide the latest and greatest functionality, or may simply have a different update policy from what is typically acceptable for a Groupware environment.
-	</para>
-	 <itemizedlist>
-		<para>
-			The Kolab server consist of the following 6 components, which can be distributed among several systems. Each of those components can be installed using the provided meta package.
-		</para>
-		 <listitem>
-			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
-				<title>Kolab-IMAP</title>
-				 <para>
-					The IMAP server component including a deamon which handles the ldap authentication.
-				</para>
-
-			</formalpara>
-			 <para>
-				<itemizedlist>
-					<para>
-						default meta-package:
-					</para>
-					 <listitem>
-						<para>
-							<application>kolab-imap</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-				 <itemizedlist>
-					<para>
-						default packages:
-					</para>
-					 <listitem>
-						<para>
-							<application>cyrus-imap</application>
-						</para>
-
-					</listitem>
-					 <listitem>
-						<para>
-							<application>kolab-daemon</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-				 <itemizedlist>
-					<para>
-						optional-packages:
-					</para>
-					 <listitem>
-						<para>
-							<application>dovecot-imap</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-
-			</para>
-
-		</listitem>
-		 <listitem>
-			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_LDAP">
-				<title>Kolab-LDAP</title>
-				 <para>
-					The ldap component is used to for the authentication of users.
-				</para>
-
-			</formalpara>
-			 <para>
-				<itemizedlist>
-					<para>
-						default meta-package:
-					</para>
-					 <listitem>
-						<para>
-							<application>kolab-ldap</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-				 <itemizedlist>
-					<para>
-						default packages:
-					</para>
-					 <listitem>
-						<para>
-							<application>openldap-server</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-
-			</para>
-
-		</listitem>
-		 <listitem>
-			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_mta">
-				<title>Kolab-mta</title>
-				 <para>
-					The mta including spam and
-				</para>
-
-			</formalpara>
-			 <para>
-				<itemizedlist>
-					<para>
-						default meta-package:
-					</para>
-					 <listitem>
-						<para>
-							<application>kolab-mta</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-				 <itemizedlist>
-					<para>
-						default packages:
-					</para>
-					 <listitem>
-						<para>
-							<application>postfix</application>
-						</para>
-
-					</listitem>
-					 <listitem>
-						<para>
-							<application>clamav</application>
-						</para>
-
-					</listitem>
-					 <listitem>
-						<para>
-							<application>amavis</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-
-			</para>
-
-		</listitem>
-		 <listitem>
-			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webadmin">
-				<title>Kolab-webadmin</title>
-				 <para>
-					A administrator webinterface. default package: kolab-webadmin
-				</para>
-
-			</formalpara>
-			<itemizedlist>
-				<para>
-					default meta-package:
-				</para>
-				 <listitem>
-					<para>
-						<application>kolab-webadmin</application>
-					</para>
-
-				</listitem>
-
-			</itemizedlist>
-
-		</listitem>
-		 <listitem>
-			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webclient">
-				<title>Kolab-webclient</title>
-				 <para>
-					An email webinterface.
-				</para>
-
-			</formalpara>
-			<itemizedlist>
-				<para>
-					default meta-package:
-				</para>
-				 <listitem>
-					<para>
-						<application>kolab-webclient</application>
-					</para>
-
-				</listitem>
-
-			</itemizedlist>
-			 <itemizedlist>
-				<para>
-					default packages:
-				</para>
-				 <listitem>
-					<para>
-						<application>kolab-webclient-roundcube</application>
-					</para>
-
-				</listitem>
-
-			</itemizedlist>
-			 <itemizedlist>
-				<para>
-					optional-packages:
-				</para>
-				 <listitem>
-					<para>
-						<application>kolab-webclient-horde</application>
-					</para>
-
-				</listitem>
-
-			</itemizedlist>
-
-		</listitem>
-		 <listitem>
-			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient_Database">
-				<title>Kolab-Webclient-Database</title>
-				 <para>
-					A database for the Kolab-webclient which stores the settings of the webclient and caches data from the imap server.
-				</para>
-
-			</formalpara>
-			 <itemizedlist>
-				<para>
-					default meta-package:
-				</para>
-				 <listitem>
-					<para>
-						<application>kolab-weblclient-database</application>
-					</para>
-
-				</listitem>
-
-			</itemizedlist>
-
-		</listitem>
-
-	</itemizedlist>
-	 <para>
-		The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
-	</para>
-	 <section id="sect-Installation_Guide-Kolab_Server-Kolab_Server_Installation">
-		<title>Kolab Server Installation</title>
-		 <para>
-			To get a fully working Kolab installation all of the 6 components above need to be installed.
-		</para>
-		 <para>
-			The Kolab community provides APT and RPM packages for most commonly used Linux distributions. To get a fully working Kolab server on a single system, please install the “kolab-groupware” meta-package which will install all components, and run the setup script on a single machine.
-		</para>
-		 <para>
-			If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
-		</para>
-		 <para>
-			For help with your deployment please refer to the “Deployment Guide”.
-		</para>
-
-	</section>
-	
-	 <section id="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages">
-		<title>Installation with APT Packages</title>
-		 <para>
-			bblablablablabl
-		</para>
-
-	</section>
-	
-	 <section id="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages">
-		<title>Installation with RPM Packages</title>
-		 <para>
-			RPM packages are being provided for the following Linux distributions and versions:
-		</para>
-		 <para>
-			<table frame="all" id="tabl-Installation_Guide-Installation_with_RPM_Packages-RPM_Packages_Distribution_Support">
-				<title>RPM Packages Distribution Support</title>
-				 <tgroup align="left" cols="5" colsep="1" rowsep="1">
-					<colspec colname="c1"></colspec>
-					 <colspec colname="c2"></colspec>
-					 <colspec colname="c3"></colspec>
-					 <colspec colname="c4"></colspec>
-					 <colspec colname="c5" colnum="5"></colspec>
-					 <thead>
-						<row>
-							<entry align="center" nameend="c4" namest="c1">
-								Distribution Information
-							</entry>
-							 <entry morerows="1">
-								EOS / EOL Date
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								Name
-							</entry>
-							 <entry>
-								CodeName
-							</entry>
-							 <entry>
-								Version
-							</entry>
-							 <entry>
-								Architectures
-							</entry>
-
-						</row>
-
-					</thead>
-					 <!-- 
+    <title>Kolab Server</title>
+    <para>
+        The Kolab server is built out of the best available Free and Open Source software components, most if not all of which are available through the Linux distribution of your preference. However, such Linux distribution may not be as up-to-date as one might wish for the Kolab Groupware to provide the latest and greatest functionality, or may simply have a different update policy from what is typically acceptable for a Groupware environment.
+    </para>
+    <itemizedlist>
+        <para>
+            The Kolab server consist of the following 6 components, which can be distributed among several systems. Each of those components can be installed using the provided meta package.
+        </para>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
+                <title>Kolab-IMAP</title>
+                <para>
+                    The IMAP server component including a deamon which handles the ldap authentication.
+                </para>
+
+            </formalpara>
+            <para>
+                <itemizedlist>
+                    <para>
+                        default meta-package:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>kolab-imap</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        default packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>cyrus-imap</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>kolab-daemon</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        optional-packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>dovecot-imap</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_LDAP">
+                <title>Kolab-LDAP</title>
+                <para>
+                    The ldap component is used to for the authentication of users.
+                </para>
+
+            </formalpara>
+            <para>
+                <itemizedlist>
+                    <para>
+                        default meta-package:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>kolab-ldap</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        default packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>openldap-server</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_mta">
+                <title>Kolab-mta</title>
+                <para>
+                    The mta including spam and
+                </para>
+
+            </formalpara>
+            <para>
+                <itemizedlist>
+                    <para>
+                        default meta-package:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>kolab-mta</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        default packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>postfix</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>clamav</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>amavis</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webadmin">
+                <title>Kolab-webadmin</title>
+                <para>
+                    A administrator webinterface. default package: kolab-webadmin
+                </para>
+
+            </formalpara>
+            <itemizedlist>
+                <para>
+                    default meta-package:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webadmin</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webclient">
+                <title>Kolab-webclient</title>
+                <para>
+                    An email webinterface.
+                </para>
+
+            </formalpara>
+            <itemizedlist>
+                <para>
+                    default meta-package:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+            <itemizedlist>
+                <para>
+                    default packages:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient-roundcube</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+            <itemizedlist>
+                <para>
+                    optional-packages:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient-horde</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient_Database">
+                <title>Kolab-Webclient-Database</title>
+                <para>
+                    A database for the Kolab-webclient which stores the settings of the webclient and caches data from the imap server.
+                </para>
+
+            </formalpara>
+            <itemizedlist>
+                <para>
+                    default meta-package:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-weblclient-database</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </listitem>
+
+    </itemizedlist>
+    <para>
+        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
+    </para>
+    <section id="sect-Installation_Guide-Kolab_Server-Kolab_Server_Installation">
+        <title>Kolab Server Installation</title>
+        <para>
+            To get a fully working Kolab installation all of the 6 components above need to be installed.
+        </para>
+        <para>
+            The Kolab community provides APT and RPM packages for most commonly used Linux distributions. To get a fully working Kolab server on a single system, please install the “kolab-groupware” meta-package which will install all components, and run the setup script on a single machine.
+        </para>
+        <para>
+            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
+        </para>
+        <para>
+            For help with your deployment please refer to the “Deployment Guide”.
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages">
+        <title>Installation with APT Packages</title>
+        <para>
+            bblablablablabl
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages">
+        <title>Installation with RPM Packages</title>
+        <para>
+            RPM packages are being provided for the following Linux distributions and versions:
+        </para>
+        <para>
+            <table frame="all" id="tabl-Installation_Guide-Installation_with_RPM_Packages-RPM_Packages_Distribution_Support">
+                <title>RPM Packages Distribution Support</title>
+                <tgroup align="left" cols="5" colsep="1" rowsep="1">
+                    <colspec colname="c1"></colspec>
+                    <colspec colname="c2"></colspec>
+                    <colspec colname="c3"></colspec>
+                    <colspec colname="c4"></colspec>
+                    <colspec colname="c5" colnum="5"></colspec>
+                    <thead>
+                        <row>
+                            <entry align="center" nameend="c4" namest="c1">
+                                Distribution Information
+                            </entry>
+                            <entry morerows="1">
+                                EOS / EOL Date
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Name
+                            </entry>
+                            <entry>
+                                CodeName
+                            </entry>
+                            <entry>
+                                Version
+                            </entry>
+                            <entry>
+                                Architectures
+                            </entry>
+
+                        </row>
+
+                    </thead>
+                    <!--
                     <tfoot> <row>
                         <entry>
                             f1
@@ -334,320 +334,320 @@
 
                     </row>
                     </tfoot>
-                     --> <tbody>
-						<row>
-							<entry>
-								CentOS
-							</entry>
-							 <entry>
-								-
-							</entry>
-							 <entry>
-								5
-							</entry>
-							 <entry>
-								i386, amd64
-							</entry>
-							 <entry>
-								Approximately Q1, 2014
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								CentOS
-							</entry>
-							 <entry>
-								-
-							</entry>
-							 <entry>
-								6
-							</entry>
-							 <entry>
-								i386, amd64
-							</entry>
-							 <entry>
-								Approximately Q4, 2017
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								Fedora
-							</entry>
-							 <entry>
-								Goddard
-							</entry>
-							 <entry>
-								13
-							</entry>
-							 <entry>
-								i386, amd64
-							</entry>
-							 <entry>
-								Q2, 2011
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								Fedora
-							</entry>
-							 <entry>
-								Laughlin
-							</entry>
-							 <entry>
-								14
-							</entry>
-							 <entry>
-								i386, amd64
-							</entry>
-							 <entry>
-								Q4, 2011
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								Red Hat Enterprise Linux
-							</entry>
-							 <entry>
-								Tikanga
-							</entry>
-							 <entry>
-								5
-							</entry>
-							 <entry>
-								i386, amd64
-							</entry>
-							 <entry>
-								Approximately Q1, 2014
-							</entry>
-
-						</row>
-						 <row>
-							<entry>
-								Red Hat Enterprise Linux
-							</entry>
-							 <entry>
-								Santiago
-							</entry>
-							 <entry>
-								6
-							</entry>
-							 <entry>
-								i386, amd64
-							</entry>
-							 <entry>
-								Approximately Q4, 2017
-							</entry>
-
-						</row>
-
-					</tbody>
-
-				</tgroup>
-
-			</table>
-
-		</para>
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Prerequisites">
-			<title>Prerequisites</title>
-			 <para>
-				Before the installation, it is necessary to add the Kolab repositories to have access to all needed packages.
-			</para>
-			 <section id="sect-Installation_Guide-Prerequisites-CentOS">
-				<title>CentOS</title>
-				 <para>
-					For full instructions on installing Kolab Groupware on CentOS, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
-				</para>
-				 <note>
-					<title>Disable 'addons' and 'extras' repositories</title>
-					 <para>
-						Please be aware that on CentOS, you will need to disable the 'addons' and 'extras' repositories, as they contain packages not part of the Enterprise Linux base operating system.
-					</para>
-					 <para>
-						The disable these repositories, edit <filename>/etc/yum.repos.d/CentOS-Base.repo</filename> and append a setting <code>enabled=0</code> to sections <code>[addons]</code> and <code>[extras]</code>, or delete the sections entirely.
-					</para>
-
-				</note>
-
-			</section>
-			
-			 <section id="sect-Installation_Guide-Prerequisites-Fedora">
-				<title>Fedora</title>
-				 <para>
-					TODO: is this correct? For full instructions on installing Kolab Groupware on Fedora, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
-				</para>
-
-			</section>
-			
-			 <section id="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux">
-				<title>Red Hat Enterprise Linux</title>
-				 <para>
-					The <ulink url="http://fedoraproject.org/wiki/EPEL">EPEL</ulink> repository is required for Kolab Groupware on Enterprise Linux 5. Install the EPEL repository using the following procedure:
-				</para>
-				 <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_epel_release_Package">
-					<title>Installing the <application>epel-release</application> Package</title>
-					 <step>
-						<para>
-							Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
-						</para>
-						 <para>
-							<itemizedlist>
-								<listitem>
-									<para>
-										<ulink url="http://download.fedora.redhat.com/pub/epel/5/i386/repoview/epel-release.html">Enterprise Linux 5</ulink> (Tikanga)
-									</para>
-
-								</listitem>
-								 <listitem>
-									<para>
-										<ulink url="http://download.fedora.redhat.com/pub/epel/6/i386/repoview/epel-release.html">Enterprise Linux 6</ulink> (Santiago)
-									</para>
-
-								</listitem>
-
-							</itemizedlist>
-
-						</para>
-
-					</step>
-					 <step>
-						<para>
-							Install this package using the following command:
-						</para>
-						 <para>
-							
+                    --> <tbody>
+                        <row>
+                            <entry>
+                                CentOS
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                5
+                            </entry>
+                            <entry>
+                                i386, amd64
+                            </entry>
+                            <entry>
+                                Approximately Q1, 2014
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                CentOS
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                6
+                            </entry>
+                            <entry>
+                                i386, amd64
+                            </entry>
+                            <entry>
+                                Approximately Q4, 2017
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Fedora
+                            </entry>
+                            <entry>
+                                Goddard
+                            </entry>
+                            <entry>
+                                13
+                            </entry>
+                            <entry>
+                                i386, amd64
+                            </entry>
+                            <entry>
+                                Q2, 2011
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Fedora
+                            </entry>
+                            <entry>
+                                Laughlin
+                            </entry>
+                            <entry>
+                                14
+                            </entry>
+                            <entry>
+                                i386, amd64
+                            </entry>
+                            <entry>
+                                Q4, 2011
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Red Hat Enterprise Linux
+                            </entry>
+                            <entry>
+                                Tikanga
+                            </entry>
+                            <entry>
+                                5
+                            </entry>
+                            <entry>
+                                i386, amd64
+                            </entry>
+                            <entry>
+                                Approximately Q1, 2014
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Red Hat Enterprise Linux
+                            </entry>
+                            <entry>
+                                Santiago
+                            </entry>
+                            <entry>
+                                6
+                            </entry>
+                            <entry>
+                                i386, amd64
+                            </entry>
+                            <entry>
+                                Approximately Q4, 2017
+                            </entry>
+
+                        </row>
+
+                    </tbody>
+
+                </tgroup>
+
+            </table>
+
+        </para>
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Prerequisites">
+            <title>Prerequisites</title>
+            <para>
+                Before the installation, it is necessary to add the Kolab repositories to have access to all needed packages.
+            </para>
+            <section id="sect-Installation_Guide-Prerequisites-CentOS">
+                <title>CentOS</title>
+                <para>
+                    For full instructions on installing Kolab Groupware on CentOS, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
+                </para>
+                <note>
+                    <title>Disable 'addons' and 'extras' repositories</title>
+                    <para>
+                        Please be aware that on CentOS, you will need to disable the 'addons' and 'extras' repositories, as they contain packages not part of the Enterprise Linux base operating system.
+                    </para>
+                    <para>
+                        The disable these repositories, edit <filename>/etc/yum.repos.d/CentOS-Base.repo</filename> and append a setting <code>enabled=0</code> to sections <code>[addons]</code> and <code>[extras]</code>, or delete the sections entirely.
+                    </para>
+
+                </note>
+
+            </section>
+
+            <section id="sect-Installation_Guide-Prerequisites-Fedora">
+                <title>Fedora</title>
+                <para>
+                    TODO: is this correct? For full instructions on installing Kolab Groupware on Fedora, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
+                </para>
+
+            </section>
+
+            <section id="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux">
+                <title>Red Hat Enterprise Linux</title>
+                <para>
+                    The <ulink url="http://fedoraproject.org/wiki/EPEL">EPEL</ulink> repository is required for Kolab Groupware on Enterprise Linux 5. Install the EPEL repository using the following procedure:
+                </para>
+                <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_epel_release_Package">
+                    <title>Installing the <application>epel-release</application> Package</title>
+                    <step>
+                        <para>
+                            Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+                        </para>
+                        <para>
+                            <itemizedlist>
+                                <listitem>
+                                    <para>
+                                        <ulink url="http://download.fedora.redhat.com/pub/epel/5/i386/repoview/epel-release.html">Enterprise Linux 5</ulink> (Tikanga)
+                                    </para>
+
+                                </listitem>
+                                <listitem>
+                                    <para>
+                                        <ulink url="http://download.fedora.redhat.com/pub/epel/6/i386/repoview/epel-release.html">Enterprise Linux 6</ulink> (Santiago)
+                                    </para>
+
+                                </listitem>
+
+                            </itemizedlist>
+
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            Install this package using the following command:
+                        </para>
+                        <para>
+
 <screen># <userinput>wget http://url/to/rpm</userinput>
 <userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
 
-						</para>
-
-					</step>
-
-				</procedure>
-				
-				 <para condition="enterprise">
-					For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
-				</para>
-				 <para>
-					The Kolab software repositories for Red Hat Enterprise Linux ship two so-called <literal>-release</literal> packages;
-				</para>
-				 <para>
-					<orderedlist>
-						<listitem condition="community">
-							<para>
-								<literal>kolab-&PRODUCT_VERSION;-community-release</literal>
-							</para>
-
-						</listitem>
-						 <listitem condition="enterprise">
-							<para>
-								<literal>kolab-&PRODUCT_VERSION;-enterprise-release</literal>
-							</para>
-
-						</listitem>
-						 <listitem condition="community">
-							<para>
-								<literal>kolab-&PRODUCT_VERSION;-community-release-development</literal>
-							</para>
-
-						</listitem>
-						 <listitem condition="enterprise">
-							<para>
-								<literal>kolab-&PRODUCT_VERSION;-enterprise-release-development</literal>
-							</para>
-
-						</listitem>
-
-					</orderedlist>
-
-				</para>
-				 <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software">
-					<title>Stable Software</title>
-					 <para>
-						Stable software, versions of packages deemed ready for general availability and production environments are distributed through two repositories, <emphasis>release</emphasis> and <emphasis>updates</emphasis>. These repositories are configured on the system, and enabled by default, by installing the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package;
-					</para>
-
-				</formalpara>
-				 <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software_Currently_in_Testing">
-					<title>Stable Software Currently in Testing</title>
-					 <para>
-						The <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package also installs a repository through which upcoming updates currently in their testing phase are distributed. This repository is called <emphasis>updates-testing</emphasis>, and is not enabled by default. Through Kolab Systems and/or community support channels, you may be asked to test an update distributed through the updates-testing repository to see if it fixes a bug you have reported. You would then, typically, temporarily enable the updates-testing repository by supplying the <literal>--enablerepo=kolab-2.4-updates-testing</literal> command-line option to YUM, overriding the system configuration file setting.
-					</para>
-
-				</formalpara>
-				 <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Software_Currently_in_Development">
-					<title>Software Currently in Development</title>
-					 <para>
-						Software that is currently in development for the product series you are running (in this case, series &PRODUCT_VERSION;) is available through the so-called <emphasis>development</emphasis> repository. This software is considered unstable. By default, you will not have the package installed that provides the configuration for this repository; the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release-development</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release-development</literal> package. Installing this package will cause the <emphasis>development</emphasis> repository to be enabled by default.
-					</para>
-
-				</formalpara>
-				 <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_kolab_PRODUCT_VERSION_community_release_Package">
-					<title>Installing the <application>kolab-&PRODUCT_VERSION;-community-release</application> Package</title>
-					 <step>
-						<para>
-							Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
-						</para>
-						 <para>
-							<itemizedlist>
-								<listitem>
-									<para>
-										<ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 5 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 5 (FIXME: page missing) </ulink>
-									</para>
-
-								</listitem>
-								 <listitem>
-									<para>
-										<ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 6 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 6 (FIXME: page missing) </ulink>
-									</para>
-
-								</listitem>
-
-							</itemizedlist>
-
-						</para>
-
-					</step>
-					 <step>
-						<para>
-							Install this package using the following command:
-						</para>
-						 <para>
-							
+                        </para>
+
+                    </step>
+
+                </procedure>
+
+                <para condition="enterprise">
+                    For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
+                </para>
+                <para>
+                    The Kolab software repositories for Red Hat Enterprise Linux ship two so-called <literal>-release</literal> packages;
+                </para>
+                <para>
+                    <orderedlist>
+                        <listitem condition="community">
+                            <para>
+                                <literal>kolab-&PRODUCT_VERSION;-community-release</literal>
+                            </para>
+
+                        </listitem>
+                        <listitem condition="enterprise">
+                            <para>
+                                <literal>kolab-&PRODUCT_VERSION;-enterprise-release</literal>
+                            </para>
+
+                        </listitem>
+                        <listitem condition="community">
+                            <para>
+                                <literal>kolab-&PRODUCT_VERSION;-community-release-development</literal>
+                            </para>
+
+                        </listitem>
+                        <listitem condition="enterprise">
+                            <para>
+                                <literal>kolab-&PRODUCT_VERSION;-enterprise-release-development</literal>
+                            </para>
+
+                        </listitem>
+
+                    </orderedlist>
+
+                </para>
+                <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software">
+                    <title>Stable Software</title>
+                    <para>
+                        Stable software, versions of packages deemed ready for general availability and production environments are distributed through two repositories, <emphasis>release</emphasis> and <emphasis>updates</emphasis>. These repositories are configured on the system, and enabled by default, by installing the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package;
+                    </para>
+
+                </formalpara>
+                <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software_Currently_in_Testing">
+                    <title>Stable Software Currently in Testing</title>
+                    <para>
+                        The <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package also installs a repository through which upcoming updates currently in their testing phase are distributed. This repository is called <emphasis>updates-testing</emphasis>, and is not enabled by default. Through Kolab Systems and/or community support channels, you may be asked to test an update distributed through the updates-testing repository to see if it fixes a bug you have reported. You would then, typically, temporarily enable the updates-testing repository by supplying the <literal>--enablerepo=kolab-2.4-updates-testing</literal> command-line option to YUM, overriding the system configuration file setting.
+                    </para>
+
+                </formalpara>
+                <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Software_Currently_in_Development">
+                    <title>Software Currently in Development</title>
+                    <para>
+                        Software that is currently in development for the product series you are running (in this case, series &PRODUCT_VERSION;) is available through the so-called <emphasis>development</emphasis> repository. This software is considered unstable. By default, you will not have the package installed that provides the configuration for this repository; the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release-development</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release-development</literal> package. Installing this package will cause the <emphasis>development</emphasis> repository to be enabled by default.
+                    </para>
+
+                </formalpara>
+                <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_kolab_PRODUCT_VERSION_community_release_Package">
+                    <title>Installing the <application>kolab-&PRODUCT_VERSION;-community-release</application> Package</title>
+                    <step>
+                        <para>
+                            Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+                        </para>
+                        <para>
+                            <itemizedlist>
+                                <listitem>
+                                    <para>
+                                        <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 5 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 5 (FIXME: page missing) </ulink>
+                                    </para>
+
+                                </listitem>
+                                <listitem>
+                                    <para>
+                                        <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 6 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 6 (FIXME: page missing) </ulink>
+                                    </para>
+
+                                </listitem>
+
+                            </itemizedlist>
+
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            Install this package using the following command:
+                        </para>
+                        <para>
+
 <screen># <userinput>wget http://url/to/rpm</userinput>
 <userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
 
-						</para>
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            To test the installation of the repository configuration, please execute:
+                        </para>
+                        <para>
 
-					</step>
-					 <step>
-						<para>
-							To test the installation of the repository configuration, please execute:
-						</para>
-						 <para>
-							
 <screen># <userinput>yum repolist</userinput>
 (...snip...)
 kolab-&PRODUCT_VERSION;
 kolab-&PRODUCT_VERSION;-updates
 (...snip...)</screen>
 
-						</para>
-						 <note>
-							<title>Output Abbreviated</title>
-							 <para>
-								Note that the output is abbreviated for clarity. The output may actually include the description of the repository, and the number of packages available.
-							</para>
-
-						</note>
-						 <para>
-							Optionally, to see which repositories have been configured though not enabled, also execute:
-						</para>
-						 <para>
-							
+                        </para>
+                        <note>
+                            <title>Output Abbreviated</title>
+                            <para>
+                                Note that the output is abbreviated for clarity. The output may actually include the description of the repository, and the number of packages available.
+                            </para>
+
+                        </note>
+                        <para>
+                            Optionally, to see which repositories have been configured though not enabled, also execute:
+                        </para>
+                        <para>
+
 <screen># <userinput>yum repolist all</userinput>
 (...snip...)
 kolab-&PRODUCT_VERSION;
@@ -661,365 +661,475 @@ kolab-&PRODUCT_VERSION;-updates-testing-debuginfo
 kolab-&PRODUCT_VERSION;-updates-testing-source
 (...snip...)</screen>
 
-						</para>
-						 <note>
-							<title>Output Abbreviated</title>
-							 <para>
-								Note that the output is abbreviated for clarity. The output may actually include the description of the repository, whether the repository is enabled by default or not, and the number of packages available in each repository as well as the total number of packages.
-							</para>
-
-						</note>
-
-					</step>
-					 <step>
-						<para>
-							At this stage of the Kolab Groupware &PRODUCT_VERSION; development and release cycle, you may require to install the development repository as well. To do so, execute the following command:
-						</para>
-						 <para>
-							
+                        </para>
+                        <note>
+                            <title>Output Abbreviated</title>
+                            <para>
+                                Note that the output is abbreviated for clarity. The output may actually include the description of the repository, whether the repository is enabled by default or not, and the number of packages available in each repository as well as the total number of packages.
+                            </para>
+
+                        </note>
+
+                    </step>
+                    <step>
+                        <para>
+                            At this stage of the Kolab Groupware &PRODUCT_VERSION; development and release cycle, you may require to install the development repository as well. To do so, execute the following command:
+                        </para>
+                        <para>
+
 <screen># <userinput>yum -y install kolab-&PRODUCT_VERSION;-community-release-development</userinput></screen>
 
-						</para>
-						 <warning>
-							<title>Development Repository Contains Unstable Software</title>
-							 <para>
-								The development repository contains unstable software, in that new versions of the software can be released through the development repository quickly, for testing purposes, before they are approved to the updates-testing stage.
-							</para>
-
-						</warning>
-
-					</step>
-
-				</procedure>
-				
-				 <para>
-					Please consider using <application>yum-priorities</application> as described in <xref linkend="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts" />.
-				</para>
-
-			</section>
-			
-			 <section id="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts">
-				<title>Using <application>yum-priorities</application> to Avoid Package Conflicts</title>
-				 <para>
-					Since any given package may, at any time, be or become available to the system through both the Kolab repositories as well as through the regular distribution repositories, to avoid the risk of switching back and forth between the two different versions continuously, by mistake or by accident, we recommend you use the following procedure including employing YUM repository priorities to eliminate the risk of running in such problems in the future.
-				</para>
-				 <procedure id="proc-Installation_Guide-Using_yum_priorities_to_Avoid_Package_Conflicts-Installing_and_Configuring_YUM_priorities">
-					<title>Installing and Configuring YUM priorities</title>
-					 <step>
-						<para>
-							The <application>yum-priorities</application> is available from the <ulink url="http://fedoraproject.org/wiki/EPEL">package repository</ulink>. Please install it:
-						</para>
-						 <para>
-							
+                        </para>
+                        <warning>
+                            <title>Development Repository Contains Unstable Software</title>
+                            <para>
+                                The development repository contains unstable software, in that new versions of the software can be released through the development repository quickly, for testing purposes, before they are approved to the updates-testing stage.
+                            </para>
+
+                        </warning>
+
+                    </step>
+
+                </procedure>
+
+                <para>
+                    Please consider using <application>yum-priorities</application> as described in <xref linkend="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts" />.
+                </para>
+
+            </section>
+
+            <section id="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts">
+                <title>Using <application>yum-priorities</application> to Avoid Package Conflicts</title>
+                <para>
+                    Since any given package may, at any time, be or become available to the system through both the Kolab repositories as well as through the regular distribution repositories, to avoid the risk of switching back and forth between the two different versions continuously, by mistake or by accident, we recommend you use the following procedure including employing YUM repository priorities to eliminate the risk of running in such problems in the future.
+                </para>
+                <procedure id="proc-Installation_Guide-Using_yum_priorities_to_Avoid_Package_Conflicts-Installing_and_Configuring_YUM_priorities">
+                    <title>Installing and Configuring YUM priorities</title>
+                    <step>
+                        <para>
+                            The <application>yum-priorities</application> is available from the <ulink url="http://fedoraproject.org/wiki/EPEL">package repository</ulink>. Please install it:
+                        </para>
+                        <para>
+
 <screen># <userinput>yum install yum-priorities</userinput></screen>
 
-						</para>
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            The repositories that have been installed using the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. This will set the correct priorities, unless you have repositories configured other than the base operating system repositories (not including 'addons' and 'extras' on CentOS platforms), EPEL and the Kolab Groupware repositories. Should the system happen to already make use of YUM priorities, please make sure the Kolab repositories have the appropriate priority.
+                        </para>
+
+                    </step>
+
+                </procedure>
+
+
+            </section>
+
+
+        </section>
+
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_LDAP_component">
+            <title>Installation of the Kolab-LDAP component</title>
+            <para>
+                For a default installation with <application>OpenLDAP</application>use:
+<screen># <userinput>yum install kolab-ldap</userinput></screen>
+
+            </para>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_LDAP_component-Configuration">
+                <title>Configuration</title>
+                <para>
+                    To configure the LDAP component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
+
+                </para>
+                <para>
+                    If you ran the script successfuly you can move on to the next component.
+                </para>
+                <para>
+                    Alternatively you may manually configure the following set of minimum values:
+                </para>
+                <para>
+                    <filename>/etc/openldap/ldap.conf</filename>
+                </para>
+                <blockquote id="bloc-Installation_Guide-Configuration-bind_addr">
+                    <title>bind_addr</title>
+
+<screen>bind_addr <replaceable>0.0.0.0</replaceable></screen>
+                    <para>
+                        The IP on which the server listens.
+                    </para>
+
+                </blockquote>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                OpenLDAP
+                            </para>
+
+                        </listitem>
+
+                    </itemizedlist>
 
-					</step>
-					 <step>
-						<para>
-							The repositories that have been installed using the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. This will set the correct priorities, unless you have repositories configured other than the base operating system repositories (not including 'addons' and 'extras' on CentOS platforms), EPEL and the Kolab Groupware repositories. Should the system happen to already make use of YUM priorities, please make sure the Kolab repositories have the appropriate priority.
-						</para>
+                </para>
 
-					</step>
+            </section>
 
-				</procedure>
-				
 
-			</section>
-			
+        </section>
 
-		</section>
-		
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_IMAP_component">
-			<title>Installation of the Kolab-IMAP component</title>
-			 <para>
-				For a default installation use: 
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_IMAP">
+            <title>Installation of IMAP</title>
+            <para>
+                For a default installation with <application>Cyrus IMAP</application> use:
 <screen># <userinput>yum install kolab-imap</userinput></screen>
 
-			</para>
-			 <para>
-				For non default installs the following packages are available: 
-				<itemizedlist>
-					<para>
-						IMAP-Servers:
-					</para>
-					 <listitem>
-						<para>
-							<application>imap-cyrus</application>
-						</para>
-
-					</listitem>
-					 <listitem>
-						<para>
-							<application>imap-dovecot</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-				 <itemizedlist>
-					<para>
-						required dependencies:
-					</para>
-					 <listitem>
-						<para>
-							<application>kolab-daemon</application>
-						</para>
-
-					</listitem>
-
-				</itemizedlist>
-
-			</para>
-			 <para>
-				Please install the desired imap server and all required dependencies. (TODO: or will the package handle the dependency?)
-			</para>
-			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_IMAP_component-Configuration">
-				<title>Configuration</title>
-				 <para>
-					To configure the IMAP component, please run the provided configuration script: 
+            </para>
+            <section id="sect-Installation_Guide-Installation_of_IMAP-Configuration">
+                <title>Configuration</title>
+                <para>
+                    To configure the IMAP component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
 
-				</para>
-				 <para>
-					Alternatively you may manually configure the following set of minimum values:
-				</para>
-				 <para>
-					<filename>/etc/cyrus.conf</filename>
-				</para>
-				 <blockquote id="bloc-Installation_Guide-Configuration-bind_addr">
-					<title>bind_addr</title>
-					 
+                </para>
+                <para>
+                    If you ran the script successfuly you can move on to the next component.
+                </para>
+                <para>
+                    Alternatively you may manually configure the following set of minimum values:
+                </para>
+                <para>
+                    <filename>/etc/cyrus.conf</filename>
+                </para>
+
+<screen>
+            # standard standalone server implementation
+
+START {
+    # do not delete this entry!
+    recover    cmd="ctl_cyrusdb -r"
+
+    # this is only necessary if using idled for IMAP IDLE
+    idled    cmd="idled"
+}
+
+SERVICES {
+    # The following lines enable the frontend server to proxy connections
+    # to the appropriate backend server.
+    #
+    imap        cmd="proxyd"        listen="imap"                        prefork=5
+    imaps    cmd="proxyd -s"    listen="imaps"                        prefork=5
+
+    # The frontend servers need to communicate about where the backend servers
+    # are, since they contain the mailboxes.
+    #
+    mupdate    cmd="mupdate"    listen=3905                            prefork=1
+    ptloader    cmd="ptloader"    listen="/var/lib/imap/ptclient/ptsock"  prefork=0
+
+    sievefilter cmd="timsieved"    listen=sievefilter                    prefork=0
+    sieve    cmd="timsieved"    listen=sieve                            prefork=0
+}
+
+
+EVENTS {
+    # This is required
+    checkpoint  cmd="ctl_cyrusdb -c" period=30
+
+    # this is only necessary if caching TLS sessions
+    tlsprune    cmd="tls_prune" at=0500
+}
+</screen>
+                <blockquote id="bloc-Installation_Guide-Configuration-bind_addr">
+                    <title>bind_addr</title>
+
 <screen>bind_addr <replaceable>0.0.0.0</replaceable></screen>
-					 <para>
-						The IP on which the server listens.
-					</para>
-
-				</blockquote>
-				 <blockquote id="bloc-Installation_Guide-Configuration-lmtp">
-					<title>lmtp</title>
-					 
-<screen>lmtp          cmd="lmtpd -a" listen="<replaceable>127.0.0.1:2003</replaceable>"</screen>
-					 <para>
-						The address on which the mta runs on.
-					</para>
-
-				</blockquote>
-				 <para>
-					<filename>/etc/imapd.conf</filename>
-				</para>
-				 <blockquote id="bloc-Installation_Guide-Configuration-admin">
-					<title>admin</title>
-					 
-<screen>admin <replaceable>user1 user2</replaceable></screen>
-					 <para>
-						The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
-					</para>
-					 <para>
-						Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
-					</para>
-
-				</blockquote>
-				 <blockquote id="bloc-Installation_Guide-Configuration-ldap_uri">
-					<title>ldap_uri</title>
-					 
-<screen>ldap_uri   <replaceable>ldap://127.0.0.1:389</replaceable></screen>
-					 <para>
-						The address where the LDAP server runs on.
-					</para>
-
-				</blockquote>
-				 <para>
-					<itemizedlist>
-						<para>
-							For detailed instructions for the manual setup please see:
-						</para>
-						 <listitem>
-							<para>
-								Cyrus-IMAP <!--     xref linkend="sect-Installation_Guide-Cyrus-IMAP" /     -->
-							</para>
-
-						</listitem>
-						 <listitem>
-							<para>
-								Dovecot-IMAP <!--     xref linkend="sect-Installation_Guide-Dovecot-IMAP" /     -->
-							</para>
-
-						</listitem>
-
-					</itemizedlist>
-
-				</para>
-
-			</section>
-			
-
-		</section>
-		
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_LDAP_component">
-			<title>Installation of the Kolab-LDAP component</title>
-			 <para>
-				For a default installation use: 
-<screen># <userinput>yum install kolab-ldap</userinput></screen>
+                    <para>
+                        The IP on which the server listens.
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-lmtp">
+                    <title>lmtp</title>
+
+<screen>lmtp        cmd="lmtpd -a" listen="<replaceable>127.0.0.1:2003</replaceable>"</screen>
+                    <para>
+                        The address on which the mta runs on.
+                    </para>
+
+                </blockquote>
+                <para>
+                    <filename>/etc/imapd.conf</filename>
+                </para>
+                <blockquote id="bloc-Installation_Guide-Configuration-servername">
+                    <title>servername</title>
+
+<screen>servername:   <replaceable>somehost.example.com</replaceable></screen>
+                    <para>
+                        This is the hostname visible in the greeting messages of the POP, IMAP and LMTP daemons. If it is unset, then the result returned from gethostname(2) is used.
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-admin">
+                    <title>admin</title>
+
+<screen>admin: <replaceable>user1 user2</replaceable></screen>
+                    <para>
+                        The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
+                    </para>
+                    <para>
+                        Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-ldap_uri">
+                    <title>ldap_uri</title>
+
+<screen>ldap_uri:   <replaceable>ldap://127.0.0.1:389</replaceable></screen>
+                    <para>
+                        The address where the LDAP server runs on.
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-ldap_base">
+                    <title>ldap_base</title>
+
+<screen>ldap_base:    <replaceable>dc=test90,dc=kolabsys,dc=com</replaceable></screen>
+                    <para>
+                        ?
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-ldap_bind_dn">
+                    <title>ldap_bind_dn</title>
+
+<screen>ldap_bind_dn:    <replaceable>cn=nobody,cn=internal,dc=test90,dc=kolabsys,dc=com</replaceable></screen>
+                    <para>
+                        ?
+                    </para>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-Configuration-ldap_password">
+                    <title>ldap_password</title>
+
+<screen>ldap_password:    <replaceable>WGonldcL43+MrvhulpU9XloeQ/1VBJhjtRZQX+F7</replaceable></screen>
+                    <para>
+                        Password for the LDAP server.
+                    </para>
+
+                </blockquote>
+                <para>
+                    TODO: move this to admin guide, on installation the service is not running yet After you have finished the configuration, plase restart the service using:
+<screen># <userinput>/etc/rc.d/init.d/cyrus-imapd restart</userinput></screen>
+
+                </para>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                Cyrus-IMAP <!--    xref linkend="sect-Installation_Guide-Cyrus-IMAP" /    -->
+                            </para>
+
+                        </listitem>
+
+                    </itemizedlist>
+
+                </para>
+
+            </section>
+
+            <section id="sect-Installation_Guide-Installation_of_IMAP-Alternative_Installing_Kolab_with_Dovecot_IMAP">
+                <title>Alternative: Installing Kolab with Dovecot IMAP</title>
+                <para>
+                    Instead of the default cyrus-imap server, <application>Dovecot IMAP</application> can be used instead.
+                </para>
+                <para>
+                    To install the Dovecot-IMAP server use:
+<screen># <userinput>yum install dovecot-imap</userinput></screen>
+
+                </para>
+                <section id="sect-Installation_Guide-Alternative_Installing_Kolab_with_Dovecot_IMAP-Configuration">
+                    <title>Configuration</title>
+                    <para>
+                        To configure the IMAP component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
 
-			</para>
-			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_LDAP_component-Configuration">
-				<title>Configuration</title>
-				 <para>
-					To configure the LDAP component, please run the provided configuration script: 
-<screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
+                    </para>
+                    <para>
+                        Alternatively you may manually configure the following set of minimum values:
+                    </para>
+                    <para>
+                        <filename>/etc/dovecot.conf</filename>
+                    </para>
+                    <blockquote id="bloc-Installation_Guide-Configuration-placeholder">
+                        <title>placeholder</title>
+
+<screen>placeholder <replaceable>replacable</replaceable></screen>
+                        <para>
+                            Comment.
+                        </para>
+
+                    </blockquote>
+                    <para>
+                        <itemizedlist>
+                            <para>
+                                For detailed instructions for the manual setup please see:
+                            </para>
+                            <listitem>
+                                <para>
+                                    Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                                </para>
 
-				</para>
-				 <para>
-					<itemizedlist>
-						<para>
-							For detailed instructions for the manual setup please see:
-						</para>
-						 <listitem>
-							<para>
-								OpenLDAP
-							</para>
+                            </listitem>
 
-						</listitem>
+                        </itemizedlist>
 
-					</itemizedlist>
+                    </para>
 
-				</para>
+                </section>
 
-			</section>
-			
 
-		</section>
-		
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_MTA_component">
-			<title>Installation of the Kolab-MTA component</title>
-			 <para>
-				For a default installation use: 
+            </section>
+
+
+        </section>
+
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_MTA_component">
+            <title>Installation of the Kolab-MTA component</title>
+            <para>
+                For a default installation use:
 <screen># <userinput>yum install kolab-mta</userinput></screen>
 
-			</para>
-			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_MTA_component-Configuration">
-				<title>Configuration</title>
-				 <para>
-					To configure the MTA component, please run the provided configuration script: 
+            </para>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_MTA_component-Configuration">
+                <title>Configuration</title>
+                <para>
+                    To configure the MTA component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/mta-setup</userinput></screen>
 
-				</para>
-				 <para>
-					<itemizedlist>
-						<para>
-							For detailed instructions for the manual setup please see:
-						</para>
-						 <listitem>
-							<para>
-								MTA
-							</para>
+                </para>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                MTA
+                            </para>
 
-						</listitem>
+                        </listitem>
 
-					</itemizedlist>
+                    </itemizedlist>
 
-				</para>
+                </para>
 
-			</section>
-			
+            </section>
 
-		</section>
-		
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webadmin_component">
-			<title>Installation of the Kolab-Webadmin component</title>
-			 <para>
-				For a default installation use: 
+
+        </section>
+
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webadmin_component">
+            <title>Installation of the Kolab-Webadmin component</title>
+            <para>
+                For a default installation use:
 <screen># <userinput>yum install kolab-webadmin</userinput></screen>
 
-			</para>
-			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_component-Configuration">
-				<title>Configuration</title>
-				 <para>
-					To configure the Webadmin component, please run the provided configuration script: 
+            </para>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_component-Configuration">
+                <title>Configuration</title>
+                <para>
+                    To configure the Webadmin component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
 
-				</para>
+                </para>
+
+            </section>
 
-			</section>
-			
 
-		</section>
-		
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_component">
-			<title>Installation of the Kolab-Webclient component</title>
-			 <para>
-				For a default installation use: 
+        </section>
+
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_component">
+            <title>Installation of the Kolab-Webclient component</title>
+            <para>
+                For a default installation use:
 <screen># <userinput>yum install kolab-webclient</userinput></screen>
 
-			</para>
-			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_component-Configuration">
-				<title>Configuration</title>
-				 <para>
-					To configure the Webclient component, please run the provided configuration script: 
+            </para>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_component-Configuration">
+                <title>Configuration</title>
+                <para>
+                    To configure the Webclient component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webclient-setup</userinput></screen>
 
-				</para>
-				 <para>
-					<itemizedlist>
-						<para>
-							For detailed instructions for the manual setup please see:
-						</para>
-						 <listitem>
-							<para>
-								Webclient
-							</para>
+                </para>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                Webclient
+                            </para>
+
+                        </listitem>
+
+                    </itemizedlist>
 
-						</listitem>
+                </para>
 
-					</itemizedlist>
+            </section>
 
-				</para>
 
-			</section>
-			
+        </section>
 
-		</section>
-		
-		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_Database_component">
-			<title>Installation of the Kolab-Webclient-Database component</title>
-			 <para>
-				For a default installation use: 
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_Database_component">
+            <title>Installation of the Kolab-Webclient-Database component</title>
+            <para>
+                For a default installation use:
 <screen># <userinput>yum install kolab-webclient-database</userinput></screen>
 
-			</para>
-			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database_component-Configuration">
-				<title>Configuration</title>
-				 <para>
-					To configure the webclient-database component, please run the provided configuration script: 
+            </para>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database_component-Configuration">
+                <title>Configuration</title>
+                <para>
+                    To configure the webclient-database component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webclient-database-setup</userinput></screen>
 
-				</para>
-				 <para>
-					<itemizedlist>
-						<para>
-							For detailed instructions for the manual setup please see:
-						</para>
-						 <listitem>
-							<para>
-								Cache
-							</para>
+                </para>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                Cache
+                            </para>
+
+                        </listitem>
+
+                    </itemizedlist>
+
+                </para>
 
-						</listitem>
+            </section>
 
-					</itemizedlist>
 
-				</para>
+        </section>
 
-			</section>
-			
 
-		</section>
-		
+    </section>
 
-	</section>
-	
 
 </chapter>
 


commit c85dab4c2381c09478944ae80a6247f3fe94a641
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 09:14:45 2011 +0200

    add info how to find services blocking a port

diff --git a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
old mode 100644
new mode 100755
index 1e43032..590112a
--- a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
+++ b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
@@ -147,6 +147,17 @@
         <para>
             Follow the directions in this process.
         </para>
+        <para>
+            If the process fails due to running services and also "/usr/sbin/kolabsrv rc all stop" does not help, the ports can be checked using:
+<screen># <userinput>lsof -Pnl +M -i4</userinput></screen>
+            on an IPv4 network and
+<screen># <userinput>lsof -Pnl +M -i6</userinput></screen>
+            for iPv6. Alternatively
+<screen># <userinput>netstat -tulpn</userinput></screen>
+            should give you the same info. Stop all services running on one of the aforementioned ports:
+<screen># <userinput>/etc/rc.d/init.d/sendmail stop</userinput></screen>
+
+        </para>
 
     </section>
 


commit 0c9f125ab8b2d21b010ce994c86189bde0db3397
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 09:14:25 2011 +0200

    start of installation doc rewrite, format more or less in place

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
old mode 100644
new mode 100755
index 09ef09e..ec0fa65
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -3,174 +3,318 @@
 <!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<chapter id="chap-Installation_Guide-Kolab_Server_Installation">
-    <title>Kolab Server Installation</title>
-    <para>
-        The Kolab server is built out of the best available Free and Open Source software components, most if not all of which are available through the Linux distribution of your preference. However, such Linux distribution may not be as up-to-date as one might wish for the Kolab Groupware to provide the latest and greatest functionality, or may simply have a different update policy from what is typically acceptable for a Groupware environment.
-    </para>
-    <para condition="community">
-        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_RPM_Packages" /> for more information.
-    </para>
-    <para condition="enterprise">
-        Kolab Systems provides two deployment methods;
-    </para>
-    <para condition="enterprise">
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <xref linkend="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_OpenPKG" /> (soon to be deprecated)
-                </para>
-
-            </listitem>
-            <listitem>
-                <para>
-                    Native Packaging; <xref linkend="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_APT_Packages" /> or <xref linkend="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_RPM_Packages" />
-                </para>
-
-            </listitem>
-
-        </itemizedlist>
-
-    </para>
-    <section condition="enterprise" id="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_OpenPKG">
-        <title>Installation with OpenPKG</title>
-        <para>
-            OpenPKG is a package management system based on RPM, allowing the Kolab product components to be provided as one set of packages with all functionality included, in one single go, for all platforms supported by OpenPKG —including most Linux-based operatig systems.
-        </para>
-        <para>
-            While there certainly are advantages to OpenPKG, it also has a few major downsides:
-        </para>
-        <simplelist>
-            <member> OpenPKG itself has become proprietary. </member>
-            <member> Kolab Groupware had to, through OpenPKG, maintain its own copy of the complete dependency stack. </member>
-            <member> Various community members have been developing native APT and RPM packages. </member>
-
-        </simplelist>
-        <warning>
-            <title>OpenPKG Deprecation Warning</title>
-            <para>
-                OpenPKG, as a distribution method for Kolab, will be deprecated, thus no longer be made available, with the 3.0 product series. Please refer to the native packaging sections in this guide for instructions on native packages provided by Kolab.
-            </para>
-
-        </warning>
-        <section id="sect-Installation_Guide-Installation_with_OpenPKG-Obtaining_the_OpenPKG_RPMs">
-            <title>Obtaining the OpenPKG RPMs</title>
-            <para>
-                Download the OpenPKG RPMs from one of the mirrors listed on <ulink url="http://www.kolab.org/mirrors.html" /> to a local directory:
-            </para>
-            <procedure id="proc-Installation_Guide-Obtaining_the_OpenPKG_RPMs-Downloading_OpenPKG_RPMs">
-                <title>Downloading OpenPKG RPMs</title>
-                <step>
-                    <para>
-
-<screen>$ <userinput>mkdir -p /tmp/kolab-install/</userinput>
-$ <userinput>cd /tmp/kolab-install/</userinput>
-$ <userinput>wget -r -l1 -nd --no-parent \</userinput>
-    <userinput>http://files.kolab.org/server/release/kolab-server-&PRODUCT_VERSION;/ix86-debian5.0/</userinput></screen>
-
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Optionally verify the integrity of the files downloaded with <emphasis>Pretty Good Privacy</emphasis> (PGP):
-                    </para>
-                    <para>
-
-<screen>$ <userinput>gpg --keyserver hkp://subkeys.pgp.net --recv-key C43E1A3E</userinput>
-$ <userinput>gpg --verify SHA1SUMS.sig</userinput>
-$ <userinput>sha1sum -c SHA1SUMS</userinput></screen>
-
-                    </para>
-
-                </step>
-
-            </procedure>
-
-            <para>
-                To install using the OpenPKG RPM packages obtained, please;
-            </para>
-            <procedure id="proc-Installation_Guide-Obtaining_the_OpenPKG_RPMs-Installation_Using_OpenPKG_RPM_Packages">
-                <title>Installation Using OpenPKG RPM Packages</title>
-                <step>
-                    <para>
-                        Become the root superuser or otherwise obtain superuser privileges.
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Navigate into the directory containing the OpenPKG RPM packages:
-                    </para>
-                    <para>
-
-<screen># <userinput>cd /tmp/kolab-install/</userinput></screen>
-
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Execute the <filename>install-kolab.sh</filename> script:
-                    </para>
-                    <para>
-
-<screen># <userinput>sh install-kolab.sh 2>&1 | tee kolab-install.log</userinput></screen>
-
-                    </para>
-
-                </step>
-
-            </procedure>
-
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_APT_Packages">
-        <title>Installation with APT Packages</title>
-        <para>
-            APT packages are provided for the following GNU/Linux distributions, and distribution versions:
-        </para>
-        <para>
-            <table frame="all" id="tabl-Installation_Guide-Installation_with_APT_Packages-APT_Packages_Distribution_Support">
-                <title>APT Packages Distribution Support</title>
-                <tgroup align="left" cols="5" colsep="1" rowsep="1">
-                    <colspec colname="c1"></colspec>
-                    <colspec colname="c2"></colspec>
-                    <colspec colname="c3"></colspec>
-                    <colspec colname="c4"></colspec>
-                    <colspec colname="c5" colnum="5"></colspec>
-                    <thead>
-                        <row>
-                            <entry align="center" nameend="c4" namest="c1">
-                                Distribution Information
-                            </entry>
-                            <entry morerows="1">
-                                EOS / EOL Date
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Name
-                            </entry>
-                            <entry>
-                                CodeName
-                            </entry>
-                            <entry>
-                                Version
-                            </entry>
-                            <entry>
-                                Architectures
-                            </entry>
-
-                        </row>
-
-                    </thead>
-                    <!--
+<chapter id="chap-Installation_Guide-Kolab_Server">
+	<title>Kolab Server</title>
+	 <para>
+		The Kolab server is built out of the best available Free and Open Source software components, most if not all of which are available through the Linux distribution of your preference. However, such Linux distribution may not be as up-to-date as one might wish for the Kolab Groupware to provide the latest and greatest functionality, or may simply have a different update policy from what is typically acceptable for a Groupware environment.
+	</para>
+	 <itemizedlist>
+		<para>
+			The Kolab server consist of the following 6 components, which can be distributed among several systems. Each of those components can be installed using the provided meta package.
+		</para>
+		 <listitem>
+			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
+				<title>Kolab-IMAP</title>
+				 <para>
+					The IMAP server component including a deamon which handles the ldap authentication.
+				</para>
+
+			</formalpara>
+			 <para>
+				<itemizedlist>
+					<para>
+						default meta-package:
+					</para>
+					 <listitem>
+						<para>
+							<application>kolab-imap</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+				 <itemizedlist>
+					<para>
+						default packages:
+					</para>
+					 <listitem>
+						<para>
+							<application>cyrus-imap</application>
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<application>kolab-daemon</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+				 <itemizedlist>
+					<para>
+						optional-packages:
+					</para>
+					 <listitem>
+						<para>
+							<application>dovecot-imap</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+
+		</listitem>
+		 <listitem>
+			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_LDAP">
+				<title>Kolab-LDAP</title>
+				 <para>
+					The ldap component is used to for the authentication of users.
+				</para>
+
+			</formalpara>
+			 <para>
+				<itemizedlist>
+					<para>
+						default meta-package:
+					</para>
+					 <listitem>
+						<para>
+							<application>kolab-ldap</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+				 <itemizedlist>
+					<para>
+						default packages:
+					</para>
+					 <listitem>
+						<para>
+							<application>openldap-server</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+
+		</listitem>
+		 <listitem>
+			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_mta">
+				<title>Kolab-mta</title>
+				 <para>
+					The mta including spam and
+				</para>
+
+			</formalpara>
+			 <para>
+				<itemizedlist>
+					<para>
+						default meta-package:
+					</para>
+					 <listitem>
+						<para>
+							<application>kolab-mta</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+				 <itemizedlist>
+					<para>
+						default packages:
+					</para>
+					 <listitem>
+						<para>
+							<application>postfix</application>
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<application>clamav</application>
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<application>amavis</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+
+		</listitem>
+		 <listitem>
+			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webadmin">
+				<title>Kolab-webadmin</title>
+				 <para>
+					A administrator webinterface. default package: kolab-webadmin
+				</para>
+
+			</formalpara>
+			<itemizedlist>
+				<para>
+					default meta-package:
+				</para>
+				 <listitem>
+					<para>
+						<application>kolab-webadmin</application>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webclient">
+				<title>Kolab-webclient</title>
+				 <para>
+					An email webinterface.
+				</para>
+
+			</formalpara>
+			<itemizedlist>
+				<para>
+					default meta-package:
+				</para>
+				 <listitem>
+					<para>
+						<application>kolab-webclient</application>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+			 <itemizedlist>
+				<para>
+					default packages:
+				</para>
+				 <listitem>
+					<para>
+						<application>kolab-webclient-roundcube</application>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+			 <itemizedlist>
+				<para>
+					optional-packages:
+				</para>
+				 <listitem>
+					<para>
+						<application>kolab-webclient-horde</application>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+		 <listitem>
+			<formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient_Database">
+				<title>Kolab-Webclient-Database</title>
+				 <para>
+					A database for the Kolab-webclient which stores the settings of the webclient and caches data from the imap server.
+				</para>
+
+			</formalpara>
+			 <itemizedlist>
+				<para>
+					default meta-package:
+				</para>
+				 <listitem>
+					<para>
+						<application>kolab-weblclient-database</application>
+					</para>
+
+				</listitem>
+
+			</itemizedlist>
+
+		</listitem>
+
+	</itemizedlist>
+	 <para>
+		The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
+	</para>
+	 <section id="sect-Installation_Guide-Kolab_Server-Kolab_Server_Installation">
+		<title>Kolab Server Installation</title>
+		 <para>
+			To get a fully working Kolab installation all of the 6 components above need to be installed.
+		</para>
+		 <para>
+			The Kolab community provides APT and RPM packages for most commonly used Linux distributions. To get a fully working Kolab server on a single system, please install the “kolab-groupware” meta-package which will install all components, and run the setup script on a single machine.
+		</para>
+		 <para>
+			If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
+		</para>
+		 <para>
+			For help with your deployment please refer to the “Deployment Guide”.
+		</para>
+
+	</section>
+	
+	 <section id="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages">
+		<title>Installation with APT Packages</title>
+		 <para>
+			bblablablablabl
+		</para>
+
+	</section>
+	
+	 <section id="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages">
+		<title>Installation with RPM Packages</title>
+		 <para>
+			RPM packages are being provided for the following Linux distributions and versions:
+		</para>
+		 <para>
+			<table frame="all" id="tabl-Installation_Guide-Installation_with_RPM_Packages-RPM_Packages_Distribution_Support">
+				<title>RPM Packages Distribution Support</title>
+				 <tgroup align="left" cols="5" colsep="1" rowsep="1">
+					<colspec colname="c1"></colspec>
+					 <colspec colname="c2"></colspec>
+					 <colspec colname="c3"></colspec>
+					 <colspec colname="c4"></colspec>
+					 <colspec colname="c5" colnum="5"></colspec>
+					 <thead>
+						<row>
+							<entry align="center" nameend="c4" namest="c1">
+								Distribution Information
+							</entry>
+							 <entry morerows="1">
+								EOS / EOL Date
+							</entry>
+
+						</row>
+						 <row>
+							<entry>
+								Name
+							</entry>
+							 <entry>
+								CodeName
+							</entry>
+							 <entry>
+								Version
+							</entry>
+							 <entry>
+								Architectures
+							</entry>
+
+						</row>
+
+					</thead>
+					 <!-- 
                     <tfoot> <row>
                         <entry>
                             f1
@@ -190,782 +334,320 @@ $ <userinput>sha1sum -c SHA1SUMS</userinput></screen>
 
                     </row>
                     </tfoot>
-                    --> <tbody>
-                        <row>
-                            <entry>
-                                Debian
-                            </entry>
-                            <entry>
-                                Lenny (oldstable)
-                            </entry>
-                            <entry>
-                                5.0
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                February 6th, 2012
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Debian
-                            </entry>
-                            <entry>
-                                Squeeze (stable)
-                            </entry>
-                            <entry>
-                                6.0
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row condition="community">
-                            <entry>
-                                Debian
-                            </entry>
-                            <entry>
-                                Wheezy (testing)
-                            </entry>
-                            <entry>
-                                7.0
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row condition="community">
-                            <entry>
-                                Debian
-                            </entry>
-                            <entry>
-                                Sid (unstable)
-                            </entry>
-                            <entry>
-                                N/A
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row condition="enterprise">
-                            <entry>
-                                Ubuntu
-                            </entry>
-                            <entry>
-                                Dapper
-                            </entry>
-                            <entry>
-                                6.06 LTS
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row condition="enterprise">
-                            <entry>
-                                Ubuntu
-                            </entry>
-                            <entry>
-                                Hardy
-                            </entry>
-                            <entry>
-                                8.04 LTS
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row condition="enterprise">
-                            <entry>
-                                Ubuntu
-                            </entry>
-                            <entry>
-                                Karmic
-                            </entry>
-                            <entry>
-                                9.10
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Ubuntu
-                            </entry>
-                            <entry>
-                                Lucid
-                            </entry>
-                            <entry>
-                                10.04 LTS
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Ubuntu
-                            </entry>
-                            <entry>
-                                Maverick
-                            </entry>
-                            <entry>
-                                10.10
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-                        <row condition="community">
-                            <entry>
-                                Ubuntu
-                            </entry>
-                            <entry>
-                                Natty
-                            </entry>
-                            <entry>
-                                -
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                T.B.D.
-                            </entry>
-
-                        </row>
-
-                    </tbody>
-
-                </tgroup>
-
-            </table>
-
-        </para>
-        <section id="sect-Installation_Guide-Installation_with_APT_Packages-Debian">
-            <title>Debian</title>
-            <procedure>
-                <step>
-                    <para>
-                        For Kolab &PRODUCT_VERSION; software packages for Debian Squeeze, add the following two lines to <filename>/etc/apt/sources.list</filename>:
-                    </para>
-                    <para condition="community">
-
-<screen>deb http://mirror.kolabsys.com/pub/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates
-deb-src http://mirror.kolabsys.com/pub/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates</screen>
-
-                    </para>
-                    <para condition="enterprise">
-
-<screen>deb https://mirror.kolabsys.com/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates
-deb-src https://mirror.kolabsys.com/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates</screen>
-
-                    </para>
-                    <note>
-                        <title>Updates in Testing Phase and Packages in Development</title>
-                        <para>
-                            Optionally, enable the <literal>updates-testing</literal> and <literal>development</literal> components for newer, but less stable packages.
-                        </para>
-
-                    </note>
-                    <para>
-                        For other versions of the Debian distribution, please replace <code>squeeze</code> with the corresponding distribution codename.
-                    </para>
-                    <important>
-                        <title>Debian Volatile (Updates) Repositories</title>
-                        <para>
-                            It is critically important to consider also enabling the so-called volatile repository for your Debian version, to enable updates for components such as <application>clamav</application>.
-                        </para>
-                        <para>
-                            To enable the volatile repository for Debian Lenny, include the following line in <filename>/etc/apt/sources.list</filename>:
-                        </para>
-                        <para>
-
-<screen>deb http://volatile.debian.org/debian-volatile stable/volatile main</screen>
-
-                        </para>
-
-                    </important>
-
-                </step>
-                <step>
-                    <para>
-                        To ensure the Kolab packages have priority over the Debian packages, such as must be the case for PHP as well as Cyrus IMAP, please make sure the APT preferences <emphasis>pin</emphasis> the mirror.kolabsys.com origin as a preferred source. Put the following in <filename>/etc/apt/preferences</filename>:
-                    </para>
-                    <para>
-
-<screen>Package: *
-Pin: origin mirror.kolabsys.com
-Pin-Priority: 501</screen>
-
-                    </para>
-
-                </step>
-                <step condition="enterprise">
-                    <para>
-                        Import the GPG key with which the repository metadata is signed:
-                    </para>
-                    <para>
-
-<screen>$ <userinput>gpg --search squeeze-packages at kolabsys.com</userinput></screen>
-
-                    </para>
-                    <para>
-                        For Debian Lenny, please replace <code>squeeze</code> with the corresponding distribution codename.
-                    </para>
-
-                </step>
-                <step condition="enterprise">
-                    <para>
-                        For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Update the repository metadata:
-                    </para>
-                    <para>
-
-<screen># <userinput>apt-get update</userinput></screen>
-
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Start the installation of the base package as follows:
-                    </para>
-                    <para>
-
-<screen># <userinput>aptitude install kolabd</userinput></screen>
-
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        When asked to confirm you want to install the package and its dependencies, press Enter.
-                    </para>
-
-                </step>
-                <step condition="community">
-                    <para>
-                        When asked to confirm you want to continue installing the packages of which the integrity nor source can be securely verified, press <keycap>y</keycap> then <keycap>Enter</keycap>.
-                    </para>
-
-                </step>
-
-            </procedure>
-
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_APT_Packages-Ubuntu">
-            <title>Ubuntu</title>
-            <procedure>
-                <step>
-                    <para>
-                        For Kolab &PRODUCT_VERSION; software packages for Ubuntu Lucid, add the following two lines to <filename>/etc/apt/sources.list</filename>:
-                    </para>
-                    <para condition="community">
-
-<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates
-deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates</screen>
-
-                    </para>
-                    <para condition="enterprise">
-
-<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates
-deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates</screen>
-
-                    </para>
-                    <para>
-                        For other versions of the Ubuntu distribution, please replace <code>lucid</code> with the corresponding distribution codename.
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        To ensure the Kolab packages have priority over the Ubuntu packages, such as must be the case for PHP as well as Cyrus IMAP, please make sure the APT preferences <emphasis>pin</emphasis> the mirror.kolabsys.com origin as a preferred source. Put the following in <filename>/etc/apt/preferences</filename>:
-                    </para>
-                    <para>
-
-<screen>Package: *
-Pin: origin mirror.kolabsys.com
-Pin-Priority: 501</screen>
-
-                    </para>
-
-                </step>
-
-            </procedure>
-
-            <para condition="enterprise">
-                For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_APT_Packages-Troubleshooting_the_APT_Package_Manager">
-            <title>Troubleshooting the APT Package Manager</title>
-            <section id="sect-Installation_Guide-Troubleshooting_the_APT_Package_Manager-Broken_Packages">
-                <title>Broken Packages</title>
-                <para>
-                    If you get an error similar to, for example:
-                </para>
-                <para>
-
-<screen>test90-1:~# apt-get install kolabd
-Reading package lists... Done
-Building dependency tree
-Reading state information... Done
-Some packages could not be installed. This may mean that you have
-requested an impossible situation or if you are using the unstable
-distribution that some required packages have not yet been created
-or been moved out of Incoming.
-The following information may help to resolve the situation:
-
-The following packages have unmet dependencies:
- kolabd:    Depends: postfix (>= 2.4) but it is not going to be installed
-            Depends: postfix-ldap (>= 2.4) but it is not going to be installed
-E: Broken packages</screen>
-
-                </para>
-                <para>
-                    The error is not caused by broken packages, but a broken package manager that cannot install <application>exim</application> and <application>postfix</application> in parallel.
-                </para>
-                <formalpara id="form-Installation_Guide-Broken_Packages-Solution">
-                    <title>Solution</title>
-                    <para>
-                        First remove any non-postfix MTA you may have installed, which in a default Debian installation is probably <application>exim</application>.
-                    </para>
-
-                </formalpara>
-                <para>
-                    To remove <application>exim</application>, execute the following with superuser privileges:
-                </para>
-                <para>
-
-<screen># <userinput>apt-get remove exim4 exim4-base exim4-config exim4-daemon-light</userinput></screen>
-
-                </para>
-                <para>
-                    Then continue installing Kolab:
-                </para>
-                <para>
-
-<screen># <userinput>aptitude install kolabd</userinput></screen>
-
-                </para>
-
-            </section>
-
-
-        </section>
-
-
-    </section>
-
-    <section id="sect-Installation_Guide-Kolab_Server_Installation-Installation_with_RPM_Packages">
-        <title>Installation with RPM Packages</title>
-        <para>
-            RPM packages are being provided for the following Linux distributions and versions:
-        </para>
-        <para>
-            <table frame="all" id="tabl-Installation_Guide-Installation_with_RPM_Packages-RPM_Packages_Distribution_Support">
-                <title>RPM Packages Distribution Support</title>
-                <tgroup align="left" cols="5" colsep="1" rowsep="1">
-                    <colspec colname="c1"></colspec>
-                    <colspec colname="c2"></colspec>
-                    <colspec colname="c3"></colspec>
-                    <colspec colname="c4"></colspec>
-                    <colspec colname="c5" colnum="5"></colspec>
-                    <thead>
-                        <row>
-                            <entry align="center" nameend="c4" namest="c1">
-                                Distribution Information
-                            </entry>
-                            <entry morerows="1">
-                                EOS / EOL Date
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Name
-                            </entry>
-                            <entry>
-                                CodeName
-                            </entry>
-                            <entry>
-                                Version
-                            </entry>
-                            <entry>
-                                Architectures
-                            </entry>
-
-                        </row>
-
-                    </thead>
-                    <!--
-                    <tfoot> <row>
-                        <entry>
-                            f1
-                        </entry>
-                        <entry>
-                            f2
-                        </entry>
-                        <entry>
-                            f3
-                        </entry>
-                        <entry>
-                            f4
-                        </entry>
-                        <entry>
-                            f5
-                        </entry>
-
-                    </row>
-                    </tfoot>
-                    --> <tbody>
-                        <row>
-                            <entry>
-                                CentOS
-                            </entry>
-                            <entry>
-                                -
-                            </entry>
-                            <entry>
-                                5
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q1, 2014
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                CentOS
-                            </entry>
-                            <entry>
-                                -
-                            </entry>
-                            <entry>
-                                6
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q4, 2017
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Fedora
-                            </entry>
-                            <entry>
-                                Goddard
-                            </entry>
-                            <entry>
-                                13
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Q2, 2011
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Fedora
-                            </entry>
-                            <entry>
-                                Laughlin
-                            </entry>
-                            <entry>
-                                14
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Q4, 2011
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Red Hat Enterprise Linux
-                            </entry>
-                            <entry>
-                                Tikanga
-                            </entry>
-                            <entry>
-                                5
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q1, 2014
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Red Hat Enterprise Linux
-                            </entry>
-                            <entry>
-                                Santiago
-                            </entry>
-                            <entry>
-                                6
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q4, 2017
-                            </entry>
-
-                        </row>
-
-                    </tbody>
-
-                </tgroup>
-
-            </table>
-
-        </para>
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-CentOS">
-            <title>CentOS</title>
-            <para>
-                For full instructions on installing Kolab Groupware on CentOS, please refer to the instructions in <xref linkend="sect-Installation_Guide-Installation_with_RPM_Packages-Red_Hat_Enterprise_Linux" />.
-            </para>
-            <note>
-                <title>Disable 'addons' and 'extras' repositories</title>
-                <para>
-                    Please be aware that on CentOS, you will need to disable the 'addons' and 'extras' repositories, as they contain packages not part of the Enterprise Linux base operating system.
-                </para>
-                <para>
-                    The disable these repositories, edit <filename>/etc/yum.repos.d/CentOS-Base.repo</filename> and append a setting <code>enabled=0</code> to sections <code>[addons]</code> and <code>[extras]</code>, or delete the sections entirely.
-                </para>
-
-            </note>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Red_Hat_Enterprise_Linux">
-            <title>Red Hat Enterprise Linux</title>
-            <para>
-                The <ulink url="http://fedoraproject.org/wiki/EPEL">EPEL</ulink> repository is required for Kolab Groupware on Enterprise Linux 5. Install the EPEL repository using the following procedure:
-            </para>
-            <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_epel_release_Package">
-                <title>Installing the <application>epel-release</application> Package</title>
-                <step>
-                    <para>
-                        Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
-                    </para>
-                    <para>
-                        <itemizedlist>
-                            <listitem>
-                                <para>
-                                    <ulink url="http://download.fedora.redhat.com/pub/epel/5/i386/repoview/epel-release.html">Enterprise Linux 5</ulink> (Tikanga)
-                                </para>
-
-                            </listitem>
-                            <listitem>
-                                <para>
-                                    <ulink url="http://download.fedora.redhat.com/pub/epel/6/i386/repoview/epel-release.html">Enterprise Linux 6</ulink> (Santiago)
-                                </para>
-
-                            </listitem>
-
-                        </itemizedlist>
-
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Install this package using the following command:
-                    </para>
-                    <para>
-
+                     --> <tbody>
+						<row>
+							<entry>
+								CentOS
+							</entry>
+							 <entry>
+								-
+							</entry>
+							 <entry>
+								5
+							</entry>
+							 <entry>
+								i386, amd64
+							</entry>
+							 <entry>
+								Approximately Q1, 2014
+							</entry>
+
+						</row>
+						 <row>
+							<entry>
+								CentOS
+							</entry>
+							 <entry>
+								-
+							</entry>
+							 <entry>
+								6
+							</entry>
+							 <entry>
+								i386, amd64
+							</entry>
+							 <entry>
+								Approximately Q4, 2017
+							</entry>
+
+						</row>
+						 <row>
+							<entry>
+								Fedora
+							</entry>
+							 <entry>
+								Goddard
+							</entry>
+							 <entry>
+								13
+							</entry>
+							 <entry>
+								i386, amd64
+							</entry>
+							 <entry>
+								Q2, 2011
+							</entry>
+
+						</row>
+						 <row>
+							<entry>
+								Fedora
+							</entry>
+							 <entry>
+								Laughlin
+							</entry>
+							 <entry>
+								14
+							</entry>
+							 <entry>
+								i386, amd64
+							</entry>
+							 <entry>
+								Q4, 2011
+							</entry>
+
+						</row>
+						 <row>
+							<entry>
+								Red Hat Enterprise Linux
+							</entry>
+							 <entry>
+								Tikanga
+							</entry>
+							 <entry>
+								5
+							</entry>
+							 <entry>
+								i386, amd64
+							</entry>
+							 <entry>
+								Approximately Q1, 2014
+							</entry>
+
+						</row>
+						 <row>
+							<entry>
+								Red Hat Enterprise Linux
+							</entry>
+							 <entry>
+								Santiago
+							</entry>
+							 <entry>
+								6
+							</entry>
+							 <entry>
+								i386, amd64
+							</entry>
+							 <entry>
+								Approximately Q4, 2017
+							</entry>
+
+						</row>
+
+					</tbody>
+
+				</tgroup>
+
+			</table>
+
+		</para>
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Prerequisites">
+			<title>Prerequisites</title>
+			 <para>
+				Before the installation, it is necessary to add the Kolab repositories to have access to all needed packages.
+			</para>
+			 <section id="sect-Installation_Guide-Prerequisites-CentOS">
+				<title>CentOS</title>
+				 <para>
+					For full instructions on installing Kolab Groupware on CentOS, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
+				</para>
+				 <note>
+					<title>Disable 'addons' and 'extras' repositories</title>
+					 <para>
+						Please be aware that on CentOS, you will need to disable the 'addons' and 'extras' repositories, as they contain packages not part of the Enterprise Linux base operating system.
+					</para>
+					 <para>
+						The disable these repositories, edit <filename>/etc/yum.repos.d/CentOS-Base.repo</filename> and append a setting <code>enabled=0</code> to sections <code>[addons]</code> and <code>[extras]</code>, or delete the sections entirely.
+					</para>
+
+				</note>
+
+			</section>
+			
+			 <section id="sect-Installation_Guide-Prerequisites-Fedora">
+				<title>Fedora</title>
+				 <para>
+					TODO: is this correct? For full instructions on installing Kolab Groupware on Fedora, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
+				</para>
+
+			</section>
+			
+			 <section id="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux">
+				<title>Red Hat Enterprise Linux</title>
+				 <para>
+					The <ulink url="http://fedoraproject.org/wiki/EPEL">EPEL</ulink> repository is required for Kolab Groupware on Enterprise Linux 5. Install the EPEL repository using the following procedure:
+				</para>
+				 <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_epel_release_Package">
+					<title>Installing the <application>epel-release</application> Package</title>
+					 <step>
+						<para>
+							Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+						</para>
+						 <para>
+							<itemizedlist>
+								<listitem>
+									<para>
+										<ulink url="http://download.fedora.redhat.com/pub/epel/5/i386/repoview/epel-release.html">Enterprise Linux 5</ulink> (Tikanga)
+									</para>
+
+								</listitem>
+								 <listitem>
+									<para>
+										<ulink url="http://download.fedora.redhat.com/pub/epel/6/i386/repoview/epel-release.html">Enterprise Linux 6</ulink> (Santiago)
+									</para>
+
+								</listitem>
+
+							</itemizedlist>
+
+						</para>
+
+					</step>
+					 <step>
+						<para>
+							Install this package using the following command:
+						</para>
+						 <para>
+							
 <screen># <userinput>wget http://url/to/rpm</userinput>
 <userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
 
-                    </para>
-
-                </step>
-
-            </procedure>
-
-            <para condition="enterprise">
-                For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
-            </para>
-            <para>
-                The Kolab software repositories for Red Hat Enterprise Linux ship two so-called <literal>-release</literal> packages;
-            </para>
-            <para>
-                <orderedlist>
-                    <listitem condition="community">
-                        <para>
-                            <literal>kolab-&PRODUCT_VERSION;-community-release</literal>
-                        </para>
-
-                    </listitem>
-                    <listitem condition="enterprise">
-                        <para>
-                            <literal>kolab-&PRODUCT_VERSION;-enterprise-release</literal>
-                        </para>
-
-                    </listitem>
-                    <listitem condition="community">
-                        <para>
-                            <literal>kolab-&PRODUCT_VERSION;-community-release-development</literal>
-                        </para>
-
-                    </listitem>
-                    <listitem condition="enterprise">
-                        <para>
-                            <literal>kolab-&PRODUCT_VERSION;-enterprise-release-development</literal>
-                        </para>
-
-                    </listitem>
-
-                </orderedlist>
-
-            </para>
-            <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software">
-                <title>Stable Software</title>
-                <para>
-                    Stable software, versions of packages deemed ready for general availability and production environments are distributed through two repositories, <emphasis>release</emphasis> and <emphasis>updates</emphasis>. These repositories are configured on the system, and enabled by default, by installing the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package;
-                </para>
-
-            </formalpara>
-            <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software_Currently_in_Testing">
-                <title>Stable Software Currently in Testing</title>
-                <para>
-                    The <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package also installs a repository through which upcoming updates currently in their testing phase are distributed. This repository is called <emphasis>updates-testing</emphasis>, and is not enabled by default. Through Kolab Systems and/or community support channels, you may be asked to test an update distributed through the updates-testing repository to see if it fixes a bug you have reported. You would then, typically, temporarily enable the updates-testing repository by supplying the <literal>--enablerepo=kolab-2.4-updates-testing</literal> command-line option to YUM, overriding the system configuration file setting.
-                </para>
-
-            </formalpara>
-            <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Software_Currently_in_Development">
-                <title>Software Currently in Development</title>
-                <para>
-                    Software that is currently in development for the product series you are running (in this case, series &PRODUCT_VERSION;) is available through the so-called <emphasis>development</emphasis> repository. This software is considered unstable. By default, you will not have the package installed that provides the configuration for this repository; the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release-development</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release-development</literal> package. Installing this package will cause the <emphasis>development</emphasis> repository to be enabled by default.
-                </para>
-
-            </formalpara>
-            <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_kolab_PRODUCT_VERSION_community_release_Package">
-                <title>Installing the <application>kolab-&PRODUCT_VERSION;-community-release</application> Package</title>
-                <step>
-                    <para>
-                        Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
-                    </para>
-                    <para>
-                        <itemizedlist>
-                            <listitem>
-                                <para>
-                                    <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 5</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 5</ulink>
-                                </para>
-
-                            </listitem>
-                            <listitem>
-                                <para>
-                                    <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 6</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 6</ulink>
-                                </para>
-
-                            </listitem>
-
-                        </itemizedlist>
-
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        Install this package using the following command:
-                    </para>
-                    <para>
-
+						</para>
+
+					</step>
+
+				</procedure>
+				
+				 <para condition="enterprise">
+					For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
+				</para>
+				 <para>
+					The Kolab software repositories for Red Hat Enterprise Linux ship two so-called <literal>-release</literal> packages;
+				</para>
+				 <para>
+					<orderedlist>
+						<listitem condition="community">
+							<para>
+								<literal>kolab-&PRODUCT_VERSION;-community-release</literal>
+							</para>
+
+						</listitem>
+						 <listitem condition="enterprise">
+							<para>
+								<literal>kolab-&PRODUCT_VERSION;-enterprise-release</literal>
+							</para>
+
+						</listitem>
+						 <listitem condition="community">
+							<para>
+								<literal>kolab-&PRODUCT_VERSION;-community-release-development</literal>
+							</para>
+
+						</listitem>
+						 <listitem condition="enterprise">
+							<para>
+								<literal>kolab-&PRODUCT_VERSION;-enterprise-release-development</literal>
+							</para>
+
+						</listitem>
+
+					</orderedlist>
+
+				</para>
+				 <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software">
+					<title>Stable Software</title>
+					 <para>
+						Stable software, versions of packages deemed ready for general availability and production environments are distributed through two repositories, <emphasis>release</emphasis> and <emphasis>updates</emphasis>. These repositories are configured on the system, and enabled by default, by installing the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package;
+					</para>
+
+				</formalpara>
+				 <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software_Currently_in_Testing">
+					<title>Stable Software Currently in Testing</title>
+					 <para>
+						The <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package also installs a repository through which upcoming updates currently in their testing phase are distributed. This repository is called <emphasis>updates-testing</emphasis>, and is not enabled by default. Through Kolab Systems and/or community support channels, you may be asked to test an update distributed through the updates-testing repository to see if it fixes a bug you have reported. You would then, typically, temporarily enable the updates-testing repository by supplying the <literal>--enablerepo=kolab-2.4-updates-testing</literal> command-line option to YUM, overriding the system configuration file setting.
+					</para>
+
+				</formalpara>
+				 <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Software_Currently_in_Development">
+					<title>Software Currently in Development</title>
+					 <para>
+						Software that is currently in development for the product series you are running (in this case, series &PRODUCT_VERSION;) is available through the so-called <emphasis>development</emphasis> repository. This software is considered unstable. By default, you will not have the package installed that provides the configuration for this repository; the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release-development</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release-development</literal> package. Installing this package will cause the <emphasis>development</emphasis> repository to be enabled by default.
+					</para>
+
+				</formalpara>
+				 <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_kolab_PRODUCT_VERSION_community_release_Package">
+					<title>Installing the <application>kolab-&PRODUCT_VERSION;-community-release</application> Package</title>
+					 <step>
+						<para>
+							Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+						</para>
+						 <para>
+							<itemizedlist>
+								<listitem>
+									<para>
+										<ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 5 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 5 (FIXME: page missing) </ulink>
+									</para>
+
+								</listitem>
+								 <listitem>
+									<para>
+										<ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 6 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 6 (FIXME: page missing) </ulink>
+									</para>
+
+								</listitem>
+
+							</itemizedlist>
+
+						</para>
+
+					</step>
+					 <step>
+						<para>
+							Install this package using the following command:
+						</para>
+						 <para>
+							
 <screen># <userinput>wget http://url/to/rpm</userinput>
 <userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
 
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        To test the installation of the repository configuration, please execute:
-                    </para>
-                    <para>
+						</para>
 
+					</step>
+					 <step>
+						<para>
+							To test the installation of the repository configuration, please execute:
+						</para>
+						 <para>
+							
 <screen># <userinput>yum repolist</userinput>
 (...snip...)
 kolab-&PRODUCT_VERSION;
 kolab-&PRODUCT_VERSION;-updates
 (...snip...)</screen>
 
-                    </para>
-                    <note>
-                        <title>Output Abbreviated</title>
-                        <para>
-                            Note that the output is abbreviated for clarity. The output may actually include the description of the repository, and the number of packages available.
-                        </para>
-
-                    </note>
-                    <para>
-                        Optionally, to see which repositories have been configured though not enabled, also execute:
-                    </para>
-                    <para>
-
+						</para>
+						 <note>
+							<title>Output Abbreviated</title>
+							 <para>
+								Note that the output is abbreviated for clarity. The output may actually include the description of the repository, and the number of packages available.
+							</para>
+
+						</note>
+						 <para>
+							Optionally, to see which repositories have been configured though not enabled, also execute:
+						</para>
+						 <para>
+							
 <screen># <userinput>yum repolist all</userinput>
 (...snip...)
 kolab-&PRODUCT_VERSION;
@@ -979,157 +661,365 @@ kolab-&PRODUCT_VERSION;-updates-testing-debuginfo
 kolab-&PRODUCT_VERSION;-updates-testing-source
 (...snip...)</screen>
 
-                    </para>
-                    <note>
-                        <title>Output Abbreviated</title>
-                        <para>
-                            Note that the output is abbreviated for clarity. The output may actually include the description of the repository, whether the repository is enabled by default or not, and the number of packages available in each repository as well as the total number of packages.
-                        </para>
-
-                    </note>
-
-                </step>
-                <step>
-                    <para>
-                        At this stage of the Kolab Groupware &PRODUCT_VERSION; development and release cycle, you may require to install the development repository as well. To do so, execute the following command:
-                    </para>
-                    <para>
-
+						</para>
+						 <note>
+							<title>Output Abbreviated</title>
+							 <para>
+								Note that the output is abbreviated for clarity. The output may actually include the description of the repository, whether the repository is enabled by default or not, and the number of packages available in each repository as well as the total number of packages.
+							</para>
+
+						</note>
+
+					</step>
+					 <step>
+						<para>
+							At this stage of the Kolab Groupware &PRODUCT_VERSION; development and release cycle, you may require to install the development repository as well. To do so, execute the following command:
+						</para>
+						 <para>
+							
 <screen># <userinput>yum -y install kolab-&PRODUCT_VERSION;-community-release-development</userinput></screen>
 
-                    </para>
-                    <warning>
-                        <title>Development Repository Contains Unstable Software</title>
-                        <para>
-                            The development repository contains unstable software, in that new versions of the software can be released through the development repository quickly, for testing purposes, before they are approved to the updates-testing stage.
-                        </para>
-
-                    </warning>
-
-                </step>
-
-            </procedure>
-
-            <para>
-                Please consider using <application>yum-priorities</application> as described in <xref linkend="sect-Installation_Guide-Installation_with_RPM_Packages-Using_yum_priorities_to_Avoid_Package_Conflicts" />.
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Fedora">
-            <title>Fedora</title>
-            <para>
-                para
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Using_yum_priorities_to_Avoid_Package_Conflicts">
-            <title>Using <application>yum-priorities</application> to Avoid Package Conflicts</title>
-            <para>
-                Since any given package may, at any time, be or become available to the system through both the Kolab repositories as well as through the regular distribution repositories, to avoid the risk of switching back and forth between the two different versions continuously, by mistake or by accident, we recommend you use the following procedure including employing YUM repository priorities to eliminate the risk of running in such problems in the future.
-            </para>
-            <procedure id="proc-Installation_Guide-Using_yum_priorities_to_Avoid_Package_Conflicts-Installing_and_Configuring_YUM_priorities">
-                <title>Installing and Configuring YUM priorities</title>
-                <step>
-                    <para>
-                        The <application>yum-priorities</application> is available from the <ulink url="http://fedoraproject.org/wiki/EPEL">package repository</ulink>. Please install it:
-                    </para>
-                    <para>
-
+						</para>
+						 <warning>
+							<title>Development Repository Contains Unstable Software</title>
+							 <para>
+								The development repository contains unstable software, in that new versions of the software can be released through the development repository quickly, for testing purposes, before they are approved to the updates-testing stage.
+							</para>
+
+						</warning>
+
+					</step>
+
+				</procedure>
+				
+				 <para>
+					Please consider using <application>yum-priorities</application> as described in <xref linkend="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts" />.
+				</para>
+
+			</section>
+			
+			 <section id="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts">
+				<title>Using <application>yum-priorities</application> to Avoid Package Conflicts</title>
+				 <para>
+					Since any given package may, at any time, be or become available to the system through both the Kolab repositories as well as through the regular distribution repositories, to avoid the risk of switching back and forth between the two different versions continuously, by mistake or by accident, we recommend you use the following procedure including employing YUM repository priorities to eliminate the risk of running in such problems in the future.
+				</para>
+				 <procedure id="proc-Installation_Guide-Using_yum_priorities_to_Avoid_Package_Conflicts-Installing_and_Configuring_YUM_priorities">
+					<title>Installing and Configuring YUM priorities</title>
+					 <step>
+						<para>
+							The <application>yum-priorities</application> is available from the <ulink url="http://fedoraproject.org/wiki/EPEL">package repository</ulink>. Please install it:
+						</para>
+						 <para>
+							
 <screen># <userinput>yum install yum-priorities</userinput></screen>
 
-                    </para>
-
-                </step>
-                <step>
-                    <para>
-                        The repositories that have been installed using the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. This will set the correct priorities, unless you have repositories configured other then the base operating system repositories (not including 'addons' and 'extras' on CentOS platforms), EPEL and the Kolab Groupware repositories. Should the system happen to already make use of YUM priorities, please make sure the Kolab repositories have the appropriate priority.
-                    </para>
-
-                </step>
-
-            </procedure>
-
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installing_the_Kolab_Daemon">
-            <title>Installing the Kolab Daemon</title>
-            <para>
-                The Kolab daemon can be installed using the following command:
-            </para>
-            <para>
-
-<screen># <userinput>yum -y install kolabd</userinput></screen>
-
-            </para>
-            <para>
-                This will also install all the dependencies for the Kolab daemon, including but not limited to;
-            </para>
-            <para>
-                <itemizedlist>
-                    <listitem>
-                        <para>
-                            <application>cyrus-imapd</application>
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <application>openldap-clients</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installing_the_Kolab_Web_Administration_Panel">
-            <title>Installing the Kolab Web Administration Panel</title>
-            <para>
-                The Kolab Web Administration Panel can be installed using the following command:
-            </para>
-            <para>
-
-<screen># <userinput>yum -y install kolab-webadmin</userinput></screen>
-
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installing_the_Kolab_Web_Client">
-            <title>Installing the Kolab Web Client</title>
-            <para>
-                The Kolab Web Client (Horde) can be installed using the following command:
-            </para>
-            <para>
-
-<screen># <userinput>yum -y install kolab-webclient</userinput></screen>
-
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installing_the_LDAP_Server">
-            <title>Installing the LDAP Server</title>
-            <para>
-                Since Kolab Groupware works based on LDAP, if you do not already have LDAP available, consider installing the OpenLDAP LDAP Server:
-            </para>
-            <para>
-
-<screen># <userinput>yum -y install openldap-server openldap-server-overlays</userinput></screen>
-
-            </para>
-
-        </section>
-
-
-    </section>
-
+						</para>
+
+					</step>
+					 <step>
+						<para>
+							The repositories that have been installed using the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. This will set the correct priorities, unless you have repositories configured other than the base operating system repositories (not including 'addons' and 'extras' on CentOS platforms), EPEL and the Kolab Groupware repositories. Should the system happen to already make use of YUM priorities, please make sure the Kolab repositories have the appropriate priority.
+						</para>
+
+					</step>
+
+				</procedure>
+				
+
+			</section>
+			
+
+		</section>
+		
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_IMAP_component">
+			<title>Installation of the Kolab-IMAP component</title>
+			 <para>
+				For a default installation use: 
+<screen># <userinput>yum install kolab-imap</userinput></screen>
+
+			</para>
+			 <para>
+				For non default installs the following packages are available: 
+				<itemizedlist>
+					<para>
+						IMAP-Servers:
+					</para>
+					 <listitem>
+						<para>
+							<application>imap-cyrus</application>
+						</para>
+
+					</listitem>
+					 <listitem>
+						<para>
+							<application>imap-dovecot</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+				 <itemizedlist>
+					<para>
+						required dependencies:
+					</para>
+					 <listitem>
+						<para>
+							<application>kolab-daemon</application>
+						</para>
+
+					</listitem>
+
+				</itemizedlist>
+
+			</para>
+			 <para>
+				Please install the desired imap server and all required dependencies. (TODO: or will the package handle the dependency?)
+			</para>
+			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_IMAP_component-Configuration">
+				<title>Configuration</title>
+				 <para>
+					To configure the IMAP component, please run the provided configuration script: 
+<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
+
+				</para>
+				 <para>
+					Alternatively you may manually configure the following set of minimum values:
+				</para>
+				 <para>
+					<filename>/etc/cyrus.conf</filename>
+				</para>
+				 <blockquote id="bloc-Installation_Guide-Configuration-bind_addr">
+					<title>bind_addr</title>
+					 
+<screen>bind_addr <replaceable>0.0.0.0</replaceable></screen>
+					 <para>
+						The IP on which the server listens.
+					</para>
+
+				</blockquote>
+				 <blockquote id="bloc-Installation_Guide-Configuration-lmtp">
+					<title>lmtp</title>
+					 
+<screen>lmtp          cmd="lmtpd -a" listen="<replaceable>127.0.0.1:2003</replaceable>"</screen>
+					 <para>
+						The address on which the mta runs on.
+					</para>
+
+				</blockquote>
+				 <para>
+					<filename>/etc/imapd.conf</filename>
+				</para>
+				 <blockquote id="bloc-Installation_Guide-Configuration-admin">
+					<title>admin</title>
+					 
+<screen>admin <replaceable>user1 user2</replaceable></screen>
+					 <para>
+						The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
+					</para>
+					 <para>
+						Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
+					</para>
+
+				</blockquote>
+				 <blockquote id="bloc-Installation_Guide-Configuration-ldap_uri">
+					<title>ldap_uri</title>
+					 
+<screen>ldap_uri   <replaceable>ldap://127.0.0.1:389</replaceable></screen>
+					 <para>
+						The address where the LDAP server runs on.
+					</para>
+
+				</blockquote>
+				 <para>
+					<itemizedlist>
+						<para>
+							For detailed instructions for the manual setup please see:
+						</para>
+						 <listitem>
+							<para>
+								Cyrus-IMAP <!--     xref linkend="sect-Installation_Guide-Cyrus-IMAP" /     -->
+							</para>
+
+						</listitem>
+						 <listitem>
+							<para>
+								Dovecot-IMAP <!--     xref linkend="sect-Installation_Guide-Dovecot-IMAP" /     -->
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</section>
+			
+
+		</section>
+		
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_LDAP_component">
+			<title>Installation of the Kolab-LDAP component</title>
+			 <para>
+				For a default installation use: 
+<screen># <userinput>yum install kolab-ldap</userinput></screen>
+
+			</para>
+			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_LDAP_component-Configuration">
+				<title>Configuration</title>
+				 <para>
+					To configure the LDAP component, please run the provided configuration script: 
+<screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
+
+				</para>
+				 <para>
+					<itemizedlist>
+						<para>
+							For detailed instructions for the manual setup please see:
+						</para>
+						 <listitem>
+							<para>
+								OpenLDAP
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</section>
+			
+
+		</section>
+		
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_MTA_component">
+			<title>Installation of the Kolab-MTA component</title>
+			 <para>
+				For a default installation use: 
+<screen># <userinput>yum install kolab-mta</userinput></screen>
+
+			</para>
+			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_MTA_component-Configuration">
+				<title>Configuration</title>
+				 <para>
+					To configure the MTA component, please run the provided configuration script: 
+<screen># <userinput>/opt/kolab/bin/mta-setup</userinput></screen>
+
+				</para>
+				 <para>
+					<itemizedlist>
+						<para>
+							For detailed instructions for the manual setup please see:
+						</para>
+						 <listitem>
+							<para>
+								MTA
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</section>
+			
+
+		</section>
+		
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webadmin_component">
+			<title>Installation of the Kolab-Webadmin component</title>
+			 <para>
+				For a default installation use: 
+<screen># <userinput>yum install kolab-webadmin</userinput></screen>
+
+			</para>
+			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_component-Configuration">
+				<title>Configuration</title>
+				 <para>
+					To configure the Webadmin component, please run the provided configuration script: 
+<screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
+
+				</para>
+
+			</section>
+			
+
+		</section>
+		
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_component">
+			<title>Installation of the Kolab-Webclient component</title>
+			 <para>
+				For a default installation use: 
+<screen># <userinput>yum install kolab-webclient</userinput></screen>
+
+			</para>
+			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_component-Configuration">
+				<title>Configuration</title>
+				 <para>
+					To configure the Webclient component, please run the provided configuration script: 
+<screen># <userinput>/opt/kolab/bin/webclient-setup</userinput></screen>
+
+				</para>
+				 <para>
+					<itemizedlist>
+						<para>
+							For detailed instructions for the manual setup please see:
+						</para>
+						 <listitem>
+							<para>
+								Webclient
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</section>
+			
+
+		</section>
+		
+		 <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_Database_component">
+			<title>Installation of the Kolab-Webclient-Database component</title>
+			 <para>
+				For a default installation use: 
+<screen># <userinput>yum install kolab-webclient-database</userinput></screen>
+
+			</para>
+			 <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database_component-Configuration">
+				<title>Configuration</title>
+				 <para>
+					To configure the webclient-database component, please run the provided configuration script: 
+<screen># <userinput>/opt/kolab/bin/webclient-database-setup</userinput></screen>
+
+				</para>
+				 <para>
+					<itemizedlist>
+						<para>
+							For detailed instructions for the manual setup please see:
+						</para>
+						 <listitem>
+							<para>
+								Cache
+							</para>
+
+						</listitem>
+
+					</itemizedlist>
+
+				</para>
+
+			</section>
+			
+
+		</section>
+		
+
+	</section>
+	
 
 </chapter>
 





More information about the commits mailing list