2 commits - Installation_Guide/en-US
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Fri Feb 18 12:23:58 CET 2011
Installation_Guide/en-US/Kolab_Server_Installation.xml | 35 +++++++++++++----
1 file changed, 28 insertions(+), 7 deletions(-)
New commits:
commit b7fee58a43db60c7316e21531b30f74868bd37cc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 18 11:19:49 2011 +0000
Add some more snippets targetted at the Enterprise
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 594a0d8..a08e9e4 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -290,9 +290,12 @@ deb-src http://mirror.kolabsys.com/pub/debian/kolab-&PRODUCT_VERSION;/ squeeze r
deb-src https://mirror.kolabsys.com/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates</screen>
</para>
- <para>
+ <para condition="community">
For Debian Lenny, Wheezy or Sid, please replace <code>squeeze</code> with the corresponding distribution codename.
</para>
+ <para condition="enterprise">
+ For Debian Lenny, please replace <code>squeeze</code> with the corresponding distribution codename.
+ </para>
<important>
<title>Debian Volatile (Updates) Repositories</title>
<para>
@@ -333,7 +336,13 @@ Pin-Priority: 501</screen>
</para>
<para>
- For Debian Lenny, Wheezy or Sid, please replace <code>squeeze</code> with the corresponding distribution codename.
+ 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>
@@ -384,7 +393,13 @@ Pin-Priority: 501</screen>
<para>
For the public, community version of Kolab &PRODUCT_VERSION; software packages for Ubuntu Natty, add the following two lines to <filename>/etc/apt/sources.list</filename>:
</para>
- <para>
+ <para condition="community">
+
+<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates
+deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates</screen>
+
+ </para>
+ <para condition="enterprise">
<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates
deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates</screen>
@@ -408,6 +423,9 @@ Pin-Priority: 501</screen>
</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>
@@ -713,6 +731,9 @@ E: Broken packages</screen>
</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. The <literal>kolab-&PRODUCT_VERSION;-community-release</literal> package contains the configuration for the stable software channels, e.g. <emphasis>release</emphasis> and <emphasis>updates</emphasis>.
</para>
@@ -726,13 +747,13 @@ E: Broken packages</screen>
<itemizedlist>
<listitem>
<para>
- <ulink url="http://mirror.kolabsys.com/pub/redhat/kolab-2.3/el5/release/i386/repoview/kolab-2.3-community-release.html">Enterprise Linux 5</ulink>
+ <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.3/el5/release/i386/repoview/kolab-2.3-community-release.html">Enterprise Linux 5</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.3/el5/release/i386/repoview/kolab-2.3-enterprise-release.html">Enterprise Linux 5</ulink>
</para>
</listitem>
<listitem>
<para>
- <ulink url="http://mirror.kolabsys.com/pub/redhat/kolab-2.3/el6/release/i386/repoview/kolab-2.3-community-release.html">Enterprise Linux 6</ulink>
+ <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.3/el6/release/i386/repoview/kolab-2.3-community-release.html">Enterprise Linux 6</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.3/el6/release/i386/repoview/kolab-2.3-enterprise-release.html">Enterprise Linux 6</ulink>
</para>
</listitem>
commit 3517bcb82976925c8541e7647fadd76761e43796
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 18 11:01:22 2011 +0000
Debian Wheezy and Sid are only supported in the Community version of the product
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index c762bff..594a0d8 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -227,7 +227,7 @@ $ <userinput>sha1sum -c SHA1SUMS</userinput></screen>
</entry>
</row>
- <row>
+ <row condition="community">
<entry>
Debian
</entry>
@@ -245,7 +245,7 @@ $ <userinput>sha1sum -c SHA1SUMS</userinput></screen>
</entry>
</row>
- <row>
+ <row condition="community">
<entry>
Debian
</entry>
More information about the commits
mailing list