diff options
Diffstat (limited to 'doc/installation')
| -rw-r--r-- | doc/installation/distributions.txt | 5 | ||||
| -rw-r--r-- | doc/installation/packages.txt | 4 | ||||
| -rw-r--r-- | doc/installation/prerequisites.txt | 40 |
3 files changed, 24 insertions, 25 deletions
diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt index a4ce9fb5d..383943e9f 100644 --- a/doc/installation/distributions.txt +++ b/doc/installation/distributions.txt @@ -93,8 +93,8 @@ Clone the git source:: git clone git://git.mcs.anl.gov/bcfg2.git Change to the osx directory and type make. Your new package should be -located at bcfg2-$VERSION.pkg (where $VERSION is that which is specified -in setup.py). +located at ``bcfg2-$VERSION.pkg`` (where ``$VERSION`` is that which is +specified in ``setup.py``). RHEL / Centos / Scientific Linux ================================ @@ -121,7 +121,6 @@ Install the bcfg2-server and bcfg2 RPMs:: .. _CentOS: http://www.centos.org/ .. _Scientific Linux: http://www.scientificlinux.org/ .. _EPEL: http://fedoraproject.org/wiki/EPEL -.. _RPMForge: https://rpmrepo.org/RPMforge Ubuntu ====== diff --git a/doc/installation/packages.txt b/doc/installation/packages.txt index b175d2625..6a9f6ed1a 100644 --- a/doc/installation/packages.txt +++ b/doc/installation/packages.txt @@ -43,11 +43,11 @@ Building RPM packages with ``rpmbuild`` While you can go about building all these things from source, this how to will try and meet the dependencies using packages from EPEL_. -The *el5* package should be compatible with CentOS 5.x. +The *el5* and the *el6* package should be compatible with CentOS 5.x. * Installation of the EPEL_ repository package :: - [root@centos ~]# rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm + [root@centos ~]# rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-6.noarch.rpm * Now you can install the rest of the prerequisites :: diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt index 758ee4a21..c86e86774 100644 --- a/doc/installation/prerequisites.txt +++ b/doc/installation/prerequisites.txt @@ -14,25 +14,25 @@ what software is needed on the client and server side. Bcfg2 Client ------------ -+----------------------------+---------------+--------------------------------+ -| Software | Version | Requires | -+============================+===============+================================+ -| libxml2 (if lxml is used) | Any | | -+----------------------------+---------------+--------------------------------+ -| libxslt (if lxml is used) | Any | libxml2 | -+----------------------------+---------------+--------------------------------+ -| python | >= 2.3 [#f1]_ | | -+----------------------------+---------------+--------------------------------+ -| lxml or elementtree [#f2]_ | Any | lxml: libxml2, libxslt, python | -+----------------------------+---------------+--------------------------------+ -| python-apt [#f3]_ | Any | python | -+----------------------------+---------------+--------------------------------+ -| debsums (if APT tool | Any | | -| driver is used) | | | -+----------------------------+---------------+--------------------------------+ - - -.. [#f1] python 2.5 works with elementtree. ++----------------------------+------------------------+--------------------------------+ +| Software | Version | Requires | ++============================+========================+================================+ +| libxml2 (if lxml is used) | Any | | ++----------------------------+------------------------+--------------------------------+ +| libxslt (if lxml is used) | Any | libxml2 | ++----------------------------+------------------------+--------------------------------+ +| python | 2.3-2.4, 2.5-2.7 [#f1] | | ++----------------------------+------------------------+--------------------------------+ +| lxml or elementtree [#f2]_ | Any | lxml: libxml2, libxslt, python | ++----------------------------+------------------------+--------------------------------+ +| python-apt [#f3]_ | Any | python | ++----------------------------+------------------------+--------------------------------+ +| debsums (if APT tool | Any | | +| driver is used) | | | ++----------------------------+------------------------+--------------------------------+ + + +.. [#f1] python 2.5 and later works with elementtree. .. [#f2] elementtree is included in python 2.5 and later. .. [#f3] python-apt is only required on platforms that use apt, such as Debian and Ubuntu. @@ -46,7 +46,7 @@ Bcfg2 Server +----------------------------+----------+--------------------------------+ | libxslt | Any | libxml2 | +----------------------------+----------+--------------------------------+ -| python | 2.2-2.5 | | +| python | 2.2-2.7 | | +----------------------------+----------+--------------------------------+ | lxml | 0.9+ | lxml: libxml2, libxslt, python | +----------------------------+----------+--------------------------------+ |