Installation_Guide/default configuration files Installation_Guide/en-US

[Christian Mollekopf]

 Installation_Guide/default                             |   22 ++---------------
 Installation_Guide/en-US/Kolab_Server_Installation.xml |    8 +++---
 2 files changed, 7 insertions(+), 23 deletions(-)

New commits:
commit 7e9abfabf8632c3f06732fe37707eafe802fe98d
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jul 1 15:52:17 2011 +0200

    removed ldap.conf, updated slapd.conf and docs

diff --git a/Installation_Guide/default configuration files/ldap.conf b/Installation_Guide/default configuration files/ldap.conf
deleted file mode 100644
index 679cc64..0000000
--- a/Installation_Guide/default configuration files/ldap.conf	
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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.conf b/Installation_Guide/default configuration files/slapd.conf
index 62247af..93b792d 100644
--- a/Installation_Guide/default configuration files/slapd.conf	
+++ b/Installation_Guide/default configuration files/slapd.conf	
@@ -37,10 +37,10 @@ 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
+TLSCertificateFile     /etc/pki/tls/certs/host.example.org.cert
+TLSCertificateKeyFile  /etc/pki/tls/certs/host.example.org.key
 
-rootDSE                /etc/kolab/rootDSE.ldif
+rootDSE                /path/to/rootDSE.ldif
 
 defaultsearchbase      "dc=example,dc=org"
 
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 5523e46..34f88a3 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -776,14 +776,14 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     <filename>/etc/openldap/slapd.conf</filename>
                 </para>
                 <para>
-                    Update all example.com domains.
+                    Update all example.org Distinguished Names.
                 </para>
                 <blockquote id="bloc-Installation_Guide-Configuration-certificates">
                     <title>certificates</title>
 
-<screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/slapd.cert</replaceable></screen>
+<screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
 
-<screen>TLSCertificateKeyFile <replaceable>/etc/pki/tls/certs/slapd.pem</replaceable></screen>
+<screen>TLSCertificateKeyFile <replaceable>/etc/pki/tls/certs/host.example.org.pem</replaceable></screen>
                     <para>
 
                     </para>
@@ -792,7 +792,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                 <blockquote id="bloc-Installation_Guide-Configuration-rootDSE">
                     <title>rootDSE</title>
 
-<screen>rootDSE <replaceable>/etc/rootDSE.ldif</replaceable></screen>
+<screen>rootDSE <replaceable>/path/to/rootDSE.ldif</replaceable></screen>
                     <para>
                         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>