diff --git a/source/installation-guide/centos-community.rst b/source/installation-guide/centos-7.rst rename from source/installation-guide/centos-community.rst rename to source/installation-guide/centos-7.rst --- a/source/installation-guide/centos-community.rst +++ b/source/installation-guide/centos-7.rst @@ -1,7 +1,14 @@ -.. _installation-centos-community: +.. _installation-guide-centos-7: -====================== -Installation on CentOS +==================================== +Installation of Kolab 16 on CentOS 7 +==================================== + +The installation of Kolab Groupware on CentOS installs +a number of additional packages, from the :term:`EPEL` software +repository. + +Installation Procedure ====================== 1. Install the :term:`EPEL` repository: @@ -15,8 +22,7 @@ .. parsed-literal:: # :command:`cd /etc/yum.repos.d/` - # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/3.4/CentOS_7/Kolab:3.4.repo` - # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/CentOS_7/Kolab:3.4:Updates.repo` + # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/16/CentOS_7/Kolab:16.repo` 3. Install the **yum-plugin-priorities** package: @@ -24,11 +30,11 @@ # :command:`yum install yum-plugin-priorities` -4. Make sure that the packages from the Kolab repositories have a higher priority than eg. the Epel packages: +4. Make sure that the packages from the Kolab repositories have a higher priority than eg. the :term:`EPEL` packages: .. parsed-literal:: - # :command:`for f in /etc/yum.repos.d/Kolab*.repo; do echo "priority=1" >> $f; done` + # :command:`for f in /etc/yum.repos.d/Kolab*.repo; do echo "priority = 60" >> $f; done` 5. Import the GPG key used to sign the packages: @@ -43,3 +49,4 @@ # :command:`yum install kolab` Continue to :ref:`install-setup-kolab`. + diff --git a/source/installation-guide/centos-enterprise.rst b/source/installation-guide/centos-enterprise.rst deleted file mode 100644 --- a/source/installation-guide/centos-enterprise.rst +++ /dev/null @@ -1,27 +0,0 @@ -.. _installation-centos-enterprise: - -====================== -Installation on CentOS -====================== - -The installation of Kolab Groupware on CentOS installs -a number of additional packages, from the :term:`EPEL` software -repository, and the repositories for the Kolab Enterprise edition, -provided by `Kolab Systems AG`_. - -CentOS 6 -======== - -.. toctree:: - :maxdepth: 1 - - centos-6-enterprise-14 - centos-6-enterprise-13 - -CentOS 7 -======== - -.. toctree:: - :maxdepth: 1 - - centos-7-enterprise-14 diff --git a/source/installation-guide/centos.rst b/source/installation-guide/centos.rst deleted file mode 100644 --- a/source/installation-guide/centos.rst +++ /dev/null @@ -1,19 +0,0 @@ -.. _installation-centos: - -====================== -Installation on CentOS -====================== - -**Kolab.org Groupware Community Edition** - - .. toctree:: - :maxdepth: 1 - - centos-community - -**Kolab Enterprise Editions** - - .. toctree:: - :maxdepth: 1 - - centos-enterprise diff --git a/source/installation-guide/debian-enterprise.rst b/source/installation-guide/debian-enterprise.rst deleted file mode 100644 --- a/source/installation-guide/debian-enterprise.rst +++ /dev/null @@ -1,13 +0,0 @@ -.. _installation-debian-enterprise: - -====================== -Installation on Debian -====================== - -Debian 7 (Wheezy) -================= - -.. toctree:: - :maxdepth: 1 - - debian-7-enterprise-14 diff --git a/source/installation-guide/debian.rst b/source/installation-guide/debian.rst deleted file mode 100644 --- a/source/installation-guide/debian.rst +++ /dev/null @@ -1,19 +0,0 @@ -.. _installation-debian: - -====================== -Installation on Debian -====================== - -**Kolab.org Groupware Community Edition** - - .. toctree:: - :maxdepth: 1 - - debian-community - -**Kolab Enterprise Editions** - - .. toctree:: - :maxdepth: 1 - - debian-enterprise diff --git a/source/installation-guide/fedora.rst b/source/installation-guide/fedora.rst deleted file mode 100644 --- a/source/installation-guide/fedora.rst +++ /dev/null @@ -1,55 +0,0 @@ -====================== -Installation on Fedora -====================== - -1. Install the Kolab Groupware repository configuration: - - For Fedora 21 (Twenty One): - - .. parsed-literal:: - - # :command:`cd /etc/yum.repos.d/` - # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/3.4/Fedora_21/Kolab:3.4.repo` - # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Fedora_21/Kolab:3.4:Updates.repo` - - For Fedora 20 (Heisenburg): - - .. parsed-literal:: - - # :command:`cd /etc/yum.repos.d/` - # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/3.4/Fedora_20/Kolab:3.4.repo` - # :command:`wget http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Fedora_20/Kolab:3.4:Updates.repo` - -2. Make sure that the Kolab repositories get a higher priority, eg. we need roundcubemail to be installed from Kolab rather than from Fedora: - - .. parsed-literal:: - - # :command: `for f in /etc/yum.repos.d/Kolab*.repo` - # :command: `do` - # :command: `sed -i "s#enabled=1#enabled=1\\npriority=0#g" $f` - # :command: `done` - -3. Import the GPG key used to sign the packages: - - .. parsed-literal:: - - # :command:`gpg --search devel@lists.kolab.org` - gpg: searching for "devel@lists.kolab.org" from hkp server pgp.mit.edu - (1) Kolab Development Coordination Mailing List - 2048 bit RSA key 446D5A45, created: 2014-08-20 - Keys 1-1 of 1 for "devel@lists.kolab.org". Enter number(s), N)ext, or Q)uit > :command:`1` - - The key's fingerprint is: ``79D8 6A05 FDE6 C9FB 4E43 A6C5 830C 2BCF 446D 5A45`` - - .. parsed-literal:: - - # :command:`gpg --export --armor devel@lists.kolab.org > devel.asc` - # :command:`rpm --import devel.asc` - -4. Install Kolab Groupware: - - .. parsed-literal:: - - # :command:`yum install kolab` - -Continue to :ref:`install-setup-kolab`. diff --git a/source/installation-guide/index.rst b/source/installation-guide/index.rst --- a/source/installation-guide/index.rst +++ b/source/installation-guide/index.rst @@ -13,72 +13,26 @@ preparing-the-system overview -Installing the Kolab.org Groupware Solution -=========================================== +Installing the Kolab Groupware Solution +======================================= -The Kolab.org Groupware solution is maintained by community volunteers -in their spare time. - -It has a fast release cycle and is in steady movement. If things do not -work as expected, please consider `contributing`_. +Install the Kolab Groupware solution for either of the following +platforms: .. toctree:: :maxdepth: 1 - centos-community - debian - fedora - opensuse - rhel-community - suse - ubuntu - ucs-community + centos-7 .. rubric:: Older versions of Kolab Groupware .. toctree:: :maxdepth: 1 + kolab-3.4/index kolab-3.3/index - -Installing Kolab Enterprise -=========================== - -Kolab Enterprise is a quality-assured version of Kolab `available from -Kolab Systems`_. - -It is professionally supported for up to 5 years and receives regular -updates with priority on security updates & errata, with delayed public -disclosure (where appropriate). - -.. toctree:: - :maxdepth: 1 - - centos-enterprise - debian-enterprise - rhel-enterprise - ucs-enterprise - -.. - These contents are old and should be hidden - -.. toctree:: 1 - :hidden: - - centos - rhel - ucs - -Configuring Kolab Groupware -=========================== - -.. toctree:: - :maxdepth: 2 - - setup-kolab - first-login - - ../glossary + kolab-14/index + kolab-13/index Installing the Kolab Desktop Client =================================== @@ -95,5 +49,3 @@ kontact-fedora kontact-windows -.. _available from Kolab Systems: https://kolabenterprise.com -.. _contributing: https://kolab.org/possible-contributions diff --git a/source/installation-guide/centos-6-enterprise-13.rst b/source/installation-guide/kolab-13/centos-6-enterprise-13.rst rename from source/installation-guide/centos-6-enterprise-13.rst rename to source/installation-guide/kolab-13/centos-6-enterprise-13.rst diff --git a/source/installation-guide/kolab-13/index.rst b/source/installation-guide/kolab-13/index.rst new file mode 100644 --- /dev/null +++ b/source/installation-guide/kolab-13/index.rst @@ -0,0 +1,12 @@ +Installation Instructions for Kolab 13 +====================================== + +.. warning:: + + Kolab 13 is outdated and the latest release is Kolab 16. + +.. toctree:: + :maxdepth: 1 + :glob: + + * diff --git a/source/installation-guide/rhel-6-enterprise-13.rst b/source/installation-guide/kolab-13/rhel-6-enterprise-13.rst rename from source/installation-guide/rhel-6-enterprise-13.rst rename to source/installation-guide/kolab-13/rhel-6-enterprise-13.rst diff --git a/source/installation-guide/ucs-3-enterprise-13.rst b/source/installation-guide/kolab-13/ucs-3-enterprise-13.rst rename from source/installation-guide/ucs-3-enterprise-13.rst rename to source/installation-guide/kolab-13/ucs-3-enterprise-13.rst --- a/source/installation-guide/ucs-3-enterprise-13.rst +++ b/source/installation-guide/kolab-13/ucs-3-enterprise-13.rst @@ -1,8 +1,8 @@ .. _installation-ucs-3-enterprise-13: -=========================================== -Installation on Univention Corporate Server -=========================================== +==================================================================== +Installation of Kolab Enterprise 13 on Univention Corporate Server 3 +==================================================================== .. IMPORTANT:: diff --git a/source/installation-guide/centos-6-enterprise-14.rst b/source/installation-guide/kolab-14/centos-6-enterprise-14.rst rename from source/installation-guide/centos-6-enterprise-14.rst rename to source/installation-guide/kolab-14/centos-6-enterprise-14.rst --- a/source/installation-guide/centos-6-enterprise-14.rst +++ b/source/installation-guide/kolab-14/centos-6-enterprise-14.rst @@ -1,4 +1,4 @@ -.. _installation-centos-6-enterprise-14: +.. _installation-guide-centos-6-enterprise-14: =============================================== Installation of Kolab Enterprise 14 on CentOS 6 diff --git a/source/installation-guide/centos-7-enterprise-14.rst b/source/installation-guide/kolab-14/centos-7-enterprise-14.rst rename from source/installation-guide/centos-7-enterprise-14.rst rename to source/installation-guide/kolab-14/centos-7-enterprise-14.rst --- a/source/installation-guide/centos-7-enterprise-14.rst +++ b/source/installation-guide/kolab-14/centos-7-enterprise-14.rst @@ -1,4 +1,4 @@ -.. _installation-centos-7-enterprise-14: +.. _installation-guide-centos-7-enterprise-14: =============================================== Installation of Kolab Enterprise 14 on CentOS 7 diff --git a/source/installation-guide/debian-7-enterprise-14.rst b/source/installation-guide/kolab-14/debian-7-enterprise-14.rst rename from source/installation-guide/debian-7-enterprise-14.rst rename to source/installation-guide/kolab-14/debian-7-enterprise-14.rst --- a/source/installation-guide/debian-7-enterprise-14.rst +++ b/source/installation-guide/kolab-14/debian-7-enterprise-14.rst @@ -1,4 +1,4 @@ -.. _installation-debian-7-enterprise-14: +.. _installation-guide-debian-7-enterprise-14: ======================================================== Installation of Kolab Enterprise 14 on Debian 7 (Wheezy) diff --git a/source/installation-guide/kolab-14/index.rst b/source/installation-guide/kolab-14/index.rst new file mode 100644 --- /dev/null +++ b/source/installation-guide/kolab-14/index.rst @@ -0,0 +1,13 @@ +====================================== +Installation Instructions for Kolab 14 +====================================== + +.. WARNING:: + + Kolab 14 is outdated and the latest release is Kolab 16. + +.. toctree:: + :maxdepth: 1 + :glob: + + * diff --git a/source/installation-guide/rhel-6-enterprise-14.rst b/source/installation-guide/kolab-14/rhel-6-enterprise-14.rst rename from source/installation-guide/rhel-6-enterprise-14.rst rename to source/installation-guide/kolab-14/rhel-6-enterprise-14.rst --- a/source/installation-guide/rhel-6-enterprise-14.rst +++ b/source/installation-guide/kolab-14/rhel-6-enterprise-14.rst @@ -1,4 +1,4 @@ -.. _installation-rhel-6-enterprise-14: +.. _installation-guide-rhel-6-enterprise-14: ================================================================= Installation of Kolab Enterprise 14 on Red Hat Enterprise Linux 6 diff --git a/source/installation-guide/rhel-7-enterprise-14.rst b/source/installation-guide/kolab-14/rhel-7-enterprise-14.rst rename from source/installation-guide/rhel-7-enterprise-14.rst rename to source/installation-guide/kolab-14/rhel-7-enterprise-14.rst --- a/source/installation-guide/rhel-7-enterprise-14.rst +++ b/source/installation-guide/kolab-14/rhel-7-enterprise-14.rst @@ -1,4 +1,4 @@ -.. _installation-rhel-7-enterprise-14: +.. _installation-guide-rhel-7-enterprise-14: ================================================================= Installation of Kolab Enterprise 14 on Red Hat Enterprise Linux 7 diff --git a/source/installation-guide/ucs-4-enterprise-14.rst b/source/installation-guide/kolab-14/ucs-4-enterprise-14.rst rename from source/installation-guide/ucs-4-enterprise-14.rst rename to source/installation-guide/kolab-14/ucs-4-enterprise-14.rst --- a/source/installation-guide/ucs-4-enterprise-14.rst +++ b/source/installation-guide/kolab-14/ucs-4-enterprise-14.rst @@ -1,8 +1,8 @@ -.. _installation-ucs-4-enterprise-14: +.. _installation-guide-ucs-4-enterprise-14: -=========================================== -Installation on Univention Corporate Server -=========================================== +==================================================================== +Installation of Kolab Enterprise 14 on Univention Corporate Server 4 +==================================================================== .. IMPORTANT:: diff --git a/source/installation-guide/centos-community.rst b/source/installation-guide/kolab-3.4/centos-7-community-3.4.rst rename from source/installation-guide/centos-community.rst rename to source/installation-guide/kolab-3.4/centos-7-community-3.4.rst --- a/source/installation-guide/centos-community.rst +++ b/source/installation-guide/kolab-3.4/centos-7-community-3.4.rst @@ -1,8 +1,8 @@ -.. _installation-centos-community: +.. _installation-guide-centos-7-community-3.4: -====================== -Installation on CentOS -====================== +===================================== +Installation of Kolab 3.4 on CentOS 7 +===================================== 1. Install the :term:`EPEL` repository: @@ -28,7 +28,7 @@ .. parsed-literal:: - # :command:`for f in /etc/yum.repos.d/Kolab*.repo; do echo "priority=1" >> $f; done` + # :command:`for f in /etc/yum.repos.d/Kolab*.repo; do echo "priority = 60" >> $f; done` 5. Import the GPG key used to sign the packages: diff --git a/source/installation-guide/debian-community.rst b/source/installation-guide/kolab-3.4/debian-7-community-3.4.rst rename from source/installation-guide/debian-community.rst rename to source/installation-guide/kolab-3.4/debian-7-community-3.4.rst --- a/source/installation-guide/debian-community.rst +++ b/source/installation-guide/kolab-3.4/debian-7-community-3.4.rst @@ -1,25 +1,16 @@ -.. _installation-debian-community: +.. _installation-guide-debian-7-community-3.4: -====================== -Installation on Debian -====================== +===================================== +Installation of Kolab 3.4 on Debian 7 +===================================== 1. Add the following two lines to ``/etc/apt/sources.list.d/kolab.list``: - For Debian Wheezy: - .. parsed-literal:: deb http://obs.kolabsys.com/repositories/Kolab:/3.4/Debian_7.0/ ./ deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Debian_7.0/ ./ - For Debian Jessie: - - .. parsed-literal:: - - deb http://obs.kolabsys.com/repositories/Kolab:/3.4/Debian_8.0/ ./ - deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Debian_8.0/ ./ - 2. Import the GPG key used to sign the packages: .. parsed-literal:: @@ -56,18 +47,8 @@ 5. Start the installation of the base package as follows: - For Debian Wheezy: - - .. parsed-literal:: - - # :command:`aptitude install kolab` - - For Debian Jessie: - .. parsed-literal:: - # :command:`# workaround: first install apache2 from Jessie, we don't want apache2 from the Kolab repos which was needed for Wheezy` - # :command:`apt-get install apache2 -t stable` # :command:`aptitude install kolab` 6. When asked to confirm you want to install the package and its dependencies, press Enter. diff --git a/source/installation-guide/ubuntu.rst b/source/installation-guide/kolab-3.4/debian-8-community-3.4.rst rename from source/installation-guide/ubuntu.rst rename to source/installation-guide/kolab-3.4/debian-8-community-3.4.rst --- a/source/installation-guide/ubuntu.rst +++ b/source/installation-guide/kolab-3.4/debian-8-community-3.4.rst @@ -1,29 +1,15 @@ -====================== -Installation on Ubuntu -====================== +.. _installation-debian-8-community-3.4: -1. Add the following two lines to ``/etc/apt/sources.list.d/kolab.list``: - - For Ubuntu 12.04: - - .. parsed-literal:: - - deb http://obs.kolabsys.com/repositories/Kolab:/3.4/Ubuntu_12.04/ ./ - deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Ubuntu_12.04/ ./ +===================================== +Installation of Kolab 3.4 on Debian 8 +===================================== - For Ubuntu 13.10: - - .. parsed-literal:: - - deb http://obs.kolabsys.com/repositories/Kolab:/3.4/Ubuntu_13.10/ ./ - deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Ubuntu_13.10/ ./ - - For Ubuntu 14.04: +1. Add the following two lines to ``/etc/apt/sources.list.d/kolab.list``: .. parsed-literal:: - deb http://obs.kolabsys.com/repositories/Kolab:/3.4/Ubuntu_14.04/ ./ - deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Ubuntu_14.04/ ./ + deb http://obs.kolabsys.com/repositories/Kolab:/3.4/Debian_8.0/ ./ + deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/Debian_8.0/ ./ 2. Import the GPG key used to sign the packages: @@ -41,7 +27,7 @@ # :command:`gpg --export --armor devel@lists.kolab.org | apt-key add -` -3. To ensure the Kolab packages have priority over the Ubuntu packages, such as +3. 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 pin the obs.kolabsys.com origin as a preferred source. diff --git a/source/installation-guide/kolab-3.4/index.rst b/source/installation-guide/kolab-3.4/index.rst new file mode 100644 --- /dev/null +++ b/source/installation-guide/kolab-3.4/index.rst @@ -0,0 +1,13 @@ +======================================= +Installation Instructions for Kolab 3.4 +======================================= + +.. WARNING:: + + Kolab 3.4 is outdated and the latest release is Kolab 16. + +.. toctree:: + :maxdepth: 1 + :glob: + + * diff --git a/source/installation-guide/rhel-community.rst b/source/installation-guide/kolab-3.4/rhel-7-community-3.4.rst rename from source/installation-guide/rhel-community.rst rename to source/installation-guide/kolab-3.4/rhel-7-community-3.4.rst --- a/source/installation-guide/rhel-community.rst +++ b/source/installation-guide/kolab-3.4/rhel-7-community-3.4.rst @@ -1,8 +1,8 @@ -.. _installation-rhel-community: +.. _installation-rhel-7-community-3.4: -======================================== -Installation on Red Hat Enterprise Linux -======================================== +======================================================= +Installation of Kolab 3.4 on Red Hat Enterprise Linux 7 +======================================================= 1. Install the :term:`EPEL`_ repository: @@ -24,13 +24,19 @@ # :command:`rpm --import https://ssl.kolabsys.com/community.asc` -4. Install the **yum-plugin-priorities** package: +4. Make sure that the packages from the Kolab repositories have a higher priority than eg. the Epel packages: .. parsed-literal:: - # :command:`yum --enablerepo=rhel-7-server-optional-rpms install kolab` + # :command:`for f in /etc/yum.repos.d/Kolab*.repo; do echo "priority = 60" >> $f; done` + +5. Install the **yum-plugin-priorities** package: + + .. parsed-literal:: + + # :command:`yum --enablerepo=rhel-7-server-optional-rpms install yum-plugin-priorities` -5. Install Kolab Groupware: +6. Install Kolab Groupware: .. parsed-literal:: diff --git a/source/installation-guide/ucs-community.rst b/source/installation-guide/kolab-3.4/ucs-4-community-3.4.rst rename from source/installation-guide/ucs-community.rst rename to source/installation-guide/kolab-3.4/ucs-4-community-3.4.rst --- a/source/installation-guide/ucs-community.rst +++ b/source/installation-guide/kolab-3.4/ucs-4-community-3.4.rst @@ -1,8 +1,8 @@ -.. _installation-ucs-community: +.. _installation-ucs-4-community-3.4: -=========================================== -Installation on Univention Corporate Server -=========================================== +========================================================== +Installation of Kolab 3.4 on Univention Corporate Server 4 +========================================================== Kolab Groupware is available in the App Center included with Univention Corporate Server. The edition in the Univention Corporate Server App @@ -27,20 +27,11 @@ 1. Add the following two lines to ``/etc/apt/sources.list.d/kolab.list``: - For UCS 4.0: - .. parsed-literal:: deb http://obs.kolabsys.com/repositories/Kolab:/3.4/UCS_4.0/ ./ deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/UCS_4.0/ ./ - For UCS 3.2: - - .. parsed-literal:: - - deb http://obs.kolabsys.com/repositories/Kolab:/3.4/UCS_3.2/ ./ - deb http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/UCS_3.2/ ./ - 2. Import the GPG key used to sign the packages: .. parsed-literal:: diff --git a/source/installation-guide/opensuse.rst b/source/installation-guide/opensuse.rst deleted file mode 100644 --- a/source/installation-guide/opensuse.rst +++ /dev/null @@ -1,44 +0,0 @@ -======================== -Installation on openSUSE -======================== - -1. Install the Kolab Groupware repositories: - - For openSUSE 13.1: - - .. parsed-literal:: - - # :command:`zypper ar http://obs.kolabsys.com/repositories/Kolab:/3.4/openSUSE_13.1/Kolab:3.4.repo` - # :command:`zypper ar http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/openSUSE_13.1/Kolab:3.4:Updates.repo` - - For openSUSE 12.3: - - .. parsed-literal:: - - # :command:`zypper ar http://obs.kolabsys.com/repositories/Kolab:/3.4/openSUSE_12.3/Kolab:3.4.repo` - # :command:`zypper ar http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/openSUSE_12.3/Kolab:3.4:Updates.repo` - -2. Import the GPG key used to sign the packages: - - .. parsed-literal:: - - # :command:`gpg --search devel@lists.kolab.org` - gpg: searching for "devel@lists.kolab.org" from hkp server pgp.mit.edu - (1) Kolab Development Coordination Mailing List - 2048 bit RSA key 446D5A45, created: 2014-08-20 - Keys 1-1 of 1 for "devel@lists.kolab.org". Enter number(s), N)ext, or Q)uit > :command:`1` - - The key's fingerprint is: ``79D8 6A05 FDE6 C9FB 4E43 A6C5 830C 2BCF 446D 5A45`` - - .. parsed-literal:: - - # :command:`gpg --export --armor devel@lists.kolab.org > devel.asc` - # :command:`rpm --import devel.asc` - -3. Install Kolab Groupware: - - .. parsed-literal:: - - # :command:`zypper in kolab` - -Continue to :ref:`install-setup-kolab`. diff --git a/source/installation-guide/preparing-the-system.rst b/source/installation-guide/preparing-the-system.rst --- a/source/installation-guide/preparing-the-system.rst +++ b/source/installation-guide/preparing-the-system.rst @@ -87,9 +87,9 @@ # :command:`setenforce 0` To disable SELinux's enforcement of the targeted policy in a manner -persistent across system restarts, edit ``/etc/selinux/config`` and set +persistent across system restarts, edit :file:`/etc/selinux/config` and set SELINUX to permissive rather than enforcing. Doing so also changes the -Mode from ``config file:`` line in the output of sestatus. +``Mode from config file:`` line in the output of :command:`sestatus`. .. _install-preparing_the_system-firewall: @@ -126,6 +126,8 @@ +------+-----------+------------------------------------------+ | 995 | tcp | Used for secure POP. | +------+-----------+------------------------------------------+ +| 8080 | tcp | Used for Manticore. | ++------+-----------+------------------------------------------+ CentOS / RHEL 6 ^^^^^^^^^^^^^^^^^ @@ -190,10 +192,7 @@ firewall-cmd --reload System Users ----------- -submission ----------- - prior to the installation of Kolab. +------------ * No user or group with the names kolab, kolab-n or kolab-r may exist on the system prior to the installation of Kolab. diff --git a/source/installation-guide/rhel-enterprise.rst b/source/installation-guide/rhel-enterprise.rst deleted file mode 100644 --- a/source/installation-guide/rhel-enterprise.rst +++ /dev/null @@ -1,27 +0,0 @@ -.. _installation-rhel-enterprise: - -======================================== -Installation on Red Hat Enterprise Linux -======================================== - -The installation of Kolab Groupware on Red Hat Enterprise Linux installs -a number of additional packages, from the :term:`EPEL` software -repository, and the repositories for the Kolab Enterprise edition, -provided by `Kolab Systems AG`_. - -Red Hat Enterprise Linux 6 -========================== - -.. toctree:: - :maxdepth: 1 - - rhel-6-enterprise-14 - rhel-6-enterprise-13 - -Red Hat Enterprise Linux 7 -========================== - -.. toctree:: - :maxdepth: 1 - - rhel-7-enterprise-14 diff --git a/source/installation-guide/rhel.rst b/source/installation-guide/rhel.rst deleted file mode 100644 --- a/source/installation-guide/rhel.rst +++ /dev/null @@ -1,19 +0,0 @@ -.. _installation-rhel: - -======================================== -Installation on Red Hat Enterprise Linux -======================================== - -**Kolab.org Groupware Community Edition** - - .. toctree:: - :maxdepth: 1 - - rhel-community - -**Kolab Enterprise Editions** - - .. toctree:: - :maxdepth: 1 - - rhel-enterprise diff --git a/source/installation-guide/suse.rst b/source/installation-guide/suse.rst deleted file mode 100644 --- a/source/installation-guide/suse.rst +++ /dev/null @@ -1,9 +0,0 @@ -============================================ -Installation on SUSE Linux Enterprise Server -============================================ - -.. todo:: - - The installation chapter for SUSE Linux Enterprise Server should be written. - -Continue to :ref:`install-setup-kolab`. diff --git a/source/installation-guide/ucs-enterprise.rst b/source/installation-guide/ucs-enterprise.rst deleted file mode 100644 --- a/source/installation-guide/ucs-enterprise.rst +++ /dev/null @@ -1,21 +0,0 @@ -.. _installation-ucs-enterprise: - -=========================================== -Installation on Univention Corporate Server -=========================================== - -UCS 3.x -======== - -.. toctree:: - :maxdepth: 1 - - ucs-3-enterprise-13 - -UCS 4.0 -======== - -.. toctree:: - :maxdepth: 1 - - ucs-4-enterprise-14 diff --git a/source/installation-guide/ucs.rst b/source/installation-guide/ucs.rst deleted file mode 100644 --- a/source/installation-guide/ucs.rst +++ /dev/null @@ -1,19 +0,0 @@ -.. _installation-ucs: - -=========================================== -Installation on Univention Corporate Server -=========================================== - -**Kolab.org Groupware Community Edition** - - .. toctree:: - :maxdepth: 1 - - ucs-community - -**Kolab Enterprise Editions** - - .. toctree:: - :maxdepth: 1 - - ucs-enterprise