2 commits - Installation_Guide/en-US Installation_Guide/Makefile Installation_Guide/publican.cfg
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Fri Feb 18 12:00:43 CET 2011
Installation_Guide/Makefile | 10 +++-
Installation_Guide/en-US/Kolab_Server_Installation.xml | 37 +++++++++++++++--
Installation_Guide/publican.cfg | 3 +
3 files changed, 44 insertions(+), 6 deletions(-)
New commits:
commit 6bc56ef7007176a4572427f352f1a2a455b802b0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 18 11:00:14 2011 +0000
Split some of the information targetted at Community from the information 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 ec8f4b2..c762bff 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -6,7 +6,13 @@
<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. Kolab therefor provides two alternative deployment methods;
+ 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="enterprise">
+ Kolab Systems provides two deployment methods;
+ </para>
+ <para condition="community">
+ The Kolab community provides two deployment methods;
</para>
<para>
<itemizedlist>
@@ -18,7 +24,7 @@
</listitem>
<listitem>
<para>
- <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" />
+ 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>
@@ -272,12 +278,21 @@ $ <userinput>sha1sum -c SHA1SUMS</userinput></screen>
<para>
For the public, community version of Kolab &PRODUCT_VERSION; software packages for Debian Squeeze, add the following two lines to <filename>/etc/apt/sources.list</filename>:
</para>
- <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>
+ <para>
+ For Debian Lenny, Wheezy or Sid, please replace <code>squeeze</code> with the corresponding distribution codename.
+ </para>
<important>
<title>Debian Volatile (Updates) Repositories</title>
<para>
@@ -308,6 +323,20 @@ 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, Wheezy or Sid, please replace <code>squeeze</code> with the corresponding distribution codename.
+ </para>
+
+ </step>
<step>
<para>
Update the repository metadata:
@@ -336,7 +365,7 @@ Pin-Priority: 501</screen>
</para>
</step>
- <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>
commit 352b3a1bb129f196059a712d3fb38fce0bed4222
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Feb 18 10:59:28 2011 +0000
Update the Publican semantics so we can split information targetted at the Community from the Enterprise
diff --git a/Installation_Guide/Makefile b/Installation_Guide/Makefile
index ca314c1..3218081 100644
--- a/Installation_Guide/Makefile
+++ b/Installation_Guide/Makefile
@@ -1,8 +1,14 @@
PACKAGE = "Installation_Guide"
all: clean clean_ids
- @publican build --langs=en-US --formats=html,html-single,pdf
- @rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$(PACKAGE)/
+ @for audience in enterprise community; do \
+ sed -r -i -e "s/^condition:.*/condition: $$audience/g" publican.cfg; \
+ cp -a en-US/Installation_Guide.ent en-US/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_Installation_Guide.ent; \
+ cp -a en-US/Installation_Guide.xml en-US/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_Installation_Guide.xml; \
+ publican build --langs=en-US --formats=html,html-single,pdf; \
+ rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_$(PACKAGE)/; \
+ done
+ @sed -r -i -e 's/^condition:.*/condition: community/g' publican.cfg
clean:
@publican clean
diff --git a/Installation_Guide/publican.cfg b/Installation_Guide/publican.cfg
index 1f5ffbf..80c612a 100644
--- a/Installation_Guide/publican.cfg
+++ b/Installation_Guide/publican.cfg
@@ -6,3 +6,6 @@ type: Book
brand: common
show_remarks: 1
+
+condition: community
+
More information about the commits
mailing list