From 5edd8c1fcd3dcfff95249b268f355f47e7553833 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 14:43:37 +0100 Subject: Updated the package and added details about Alpine Linux and RHEL 6.x --- doc/installation/distributions.txt | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt index 383943e9f..7fdfc36f6 100644 --- a/doc/installation/distributions.txt +++ b/doc/installation/distributions.txt @@ -10,6 +10,17 @@ The installation of Bcfg2 on a specific distribution depends on the package management tool and the availability of the package in the distribution's repository. +Alpine Linux +============ + +Packages for `Alpine Linux`_ are available in the `testing`_ repository. +Just use `apk` to perform the installation :: + + apk add bcfg2 bcfg2-server -U -X http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted + +.. _Alpine Linux: http://www.alpinelinux.org/ +.. _testing: http://git.alpinelinux.org/cgit/aports/tree/testing/bcfg2 + ArchLinux ========= @@ -101,13 +112,16 @@ RHEL / Centos / Scientific Linux While you can go about building all these things from source, this section will try and meet the dependencies using packages from EPEL_ -[#f1]_. The *el5* and the soon available *el6* package should be compatible +[#f1]_. The *el5* and the *el6* package should be compatible with `CentOS`_ 5.x/6.x and `Scientific Linux`_. -EPEL_:: +EPEL_ for 5.x :: [root@centos ~]# rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm +EPEL_ for 6.x :: + [root@centos ~]# rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-5.noarch.rpm + Install the bcfg2-server and bcfg2 RPMs:: [root@centos ~]# yum install bcfg2-server bcfg2 -- cgit v1.2.3-1-g7c22 From 04711dd9b4472ba12058c6f0a67e6323ae29242c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 14:47:56 +0100 Subject: Added details about epel 6.x --- doc/appendix/guides/using-bcfg2-with-centos.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/appendix/guides/using-bcfg2-with-centos.txt b/doc/appendix/guides/using-bcfg2-with-centos.txt index cd00e5e79..6a48fc5da 100644 --- a/doc/appendix/guides/using-bcfg2-with-centos.txt +++ b/doc/appendix/guides/using-bcfg2-with-centos.txt @@ -23,11 +23,13 @@ While you can go about building all these things from source, this how to will try and meet the dependencies using packages from EPEL_ or RPMforge_. The *el5* package should be compatible with CentOS 5.x. -EPEL_:: +EPEL_ for 5.x :: + [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-3.noarch.rpm +EPEL_ for 6.x :: + [root@centos ~]# rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-5.noarch.rpm -RPMforge_:: +RPMforge_ for 5.x :: [root@centos ~]# rpm -Uvh http://dag.wieers.com/rpm/packages/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm -- cgit v1.2.3-1-g7c22 From 7bcf0de5d3b59dd558bdd63a766f9052a2c6a56f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 14:51:23 +0100 Subject: newline added --- doc/installation/distributions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt index 7fdfc36f6..3dcfd7721 100644 --- a/doc/installation/distributions.txt +++ b/doc/installation/distributions.txt @@ -116,7 +116,6 @@ section will try and meet the dependencies using packages from EPEL_ with `CentOS`_ 5.x/6.x and `Scientific Linux`_. EPEL_ for 5.x :: - [root@centos ~]# rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm EPEL_ for 6.x :: -- cgit v1.2.3-1-g7c22 From 7d4dce3432fcd49d66d774c63f8ac2057f75f54b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 15:40:25 +0100 Subject: Updated my email address --- doc/appendix/contributors.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/appendix/contributors.txt b/doc/appendix/contributors.txt index ebc49d364..700485c4e 100644 --- a/doc/appendix/contributors.txt +++ b/doc/appendix/contributors.txt @@ -31,7 +31,7 @@ In alphabetical order of the given name: - David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support. - Ed Smith has done substantial hardening of the Bcfg client and server and implemented a common logging infrastructure. -- Fabian Affolter made some patches, added +- Fabian Affolter made some patches, added some new features and plugins, and restructured the manual for Bcfg2. - Jack Neely worked on YUMng. - James Yang worked on ``bcfg2-admin`` and -- cgit v1.2.3-1-g7c22 From 57e45fcc3ab3a018551b10d8d7bfbd042d37b2e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 15:41:17 +0100 Subject: Updated my email address --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index f13deb691..d2bebd02f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,7 +9,7 @@ In no particular order: - Tim Laszlo worked on the reporting system and made plugins. -- Fabian Affolter made some patches, added +- Fabian Affolter made some patches, added some new features and plugins, and restructured the manual for Bcfg2. - Andrew Brestick fixed bugs and completed -- cgit v1.2.3-1-g7c22 From 30e41a549480de1cfe6dcd01712997b2a53f27ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 15:45:41 +0100 Subject: Added Chris --- doc/appendix/contributors.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/appendix/contributors.txt b/doc/appendix/contributors.txt index 700485c4e..1afc62706 100644 --- a/doc/appendix/contributors.txt +++ b/doc/appendix/contributors.txt @@ -11,7 +11,7 @@ Contributors .. This is list is no longer in chronological order like the - AUTHORS file because it's easier to maintain (for me). + AUTHORS file because it's easier to maintain. Automatically sorted. In alphabetical order of the given name: @@ -22,6 +22,8 @@ In alphabetical order of the given name: which was used in the Bcfg2 client. - Chris Vuletich wrote some SSL code and the verification debugging code. +- Chris St. Pierre (re)wrote bcfg2-lint and has + made other miscellaneous contributions. - Cory Lueninghoener wrote the showentries function in ``bcfg2-info``. - Daniel Clark created encap packages for bcfg2 and @@ -45,7 +47,7 @@ In alphabetical order of the given name: - Ken Raffenetti and Rick Bradshaw have written the Hostbase plugin. - Michael Jinks wrote the Gentoo tool drivers. -- Narayan Desai has written most of bcfg2, including all +- Narayan Desai has written most of Bcfg2, including all parts not explicitly mentioned in this file. - Patrick Ruckstuhl fixed bugs in the templating. - Pedro Flores made the Reporting system design help. -- cgit v1.2.3-1-g7c22 From 8e6864bb8031516f6779c875f0a10797323e59df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 16:02:53 +0100 Subject: Moved content from centos guide to this section --- doc/appendix/configuration/mrepo.txt | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/doc/appendix/configuration/mrepo.txt b/doc/appendix/configuration/mrepo.txt index 309cd6779..c1bdb3fed 100644 --- a/doc/appendix/configuration/mrepo.txt +++ b/doc/appendix/configuration/mrepo.txt @@ -7,7 +7,7 @@ mrepo ===== -This section describes how to setup an `mrepo`_ mirror. +.. This section describes how to setup an `mrepo`_ mirror. `mrepo`_ builds a local APT/Yum RPM repository from local ISO files, downloaded updates, and extra packages from 3rd party repositories. It @@ -68,3 +68,27 @@ Update the repositories :: mrepo -ug + +Example sources.xml file +------------------------ + +.. code-block:: xml + + + + + centos-5.4 + http://mrepo/centos5-x86_64/RPMS.os + x86_64 + + + centos-5.4 + http://mrepo/centos5-x86_64/RPMS.updates + x86_64 + + + centos-5.4 + http://mrepo/centos5-x86_64/RPMS.extras + x86_64 + + -- cgit v1.2.3-1-g7c22 From 885de6413d315d695a1cfe8c2c7c6972200c104a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 16:10:03 +0100 Subject: Minor layout changes --- doc/server/plugins/generators/packages.txt | 94 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt index 0f4a9bb96..555f7ac97 100644 --- a/doc/server/plugins/generators/packages.txt +++ b/doc/server/plugins/generators/packages.txt @@ -8,12 +8,11 @@ Packages .. versionadded:: 1.0.0 -This page documents the Packages plugin. Packages is an alternative to -:ref:`Pkgmgr ` for specifying package -entries for clients. Where Pkgmgr explicitly specifies package entry -information, Packages delegates control of package version information to -the underlying package manager, installing the latest version available -through those channels. +Packages is an alternative to :ref:`Pkgmgr ` + for specifying package entries for clients. Where Pkgmgr explicitly +specifies package entry information, Packages delegates control of package +version information to the underlying package manager, installing the latest +version available through those channels. .. _server-plugins-generators-packages-magic-groups: @@ -58,7 +57,7 @@ member clients. Magic OS groups can be disabled in Bcfg2 1.2 and greater by setting ``magic_groups`` to ``0`` in ``Packages/packages.conf``. This may give you greater flexibility in determining which source types to - use for which OSes. Magic architecture groups cannot be disabled. + use for which OSes. Magic architecture groups cannot be disabled. Limiting sources to groups @@ -146,7 +145,7 @@ future releases. In the meantime, you can work around this issue by blacklisting the offending Package in your Sources. The blacklist element should immediately follow the Component section of your source and should look like the following:: - + .. code-block:: xml unwanted-packagename If you use the built-in :ref:`Yum config generator @@ -161,7 +160,7 @@ Handling GPG Keys Packages can automatically handle GPG signing keys for Yum and Pulp repositories. Simply specify the URL to the GPG key(s) for a repository in ``sources.xml``:: - + .. code-block:: xml x86_64 @@ -183,9 +182,11 @@ REST API. Example usage ============= +APT +--- Create a ``sources.xml`` file in the Packages directory that looks something like this:: - + .. code-block:: xml -Yum sources can be similarly specified:: +YUM +--- +Yum sources can be similarly specified:: + .. code-block:: xml `` are very simple to specify due to the amount of data that can be queried from Pulp itself:: + .. code-block:: xml @@ -247,18 +255,19 @@ due to the amount of data that can be queried from Pulp itself:: -.. note:: There is also a rawurl attribute for specifying sources that - don't follow the conventional layout. +Raw URLs +-------- +For specifying sources that don't follow the conventional layout, the rawurl +attribute is useful:: - .. code-block:: xml - - - - - x86_64 - - + + + x86_64 + + x86_64 @@ -269,20 +278,19 @@ due to the amount of data that can be queried from Pulp itself:: - .. code-block:: xml - - - - - amd64 - - - i386 - - - + .. code-block:: xml + + + + amd64 + + + i386 + + + Configuration Updates ===================== @@ -356,6 +364,7 @@ Package Checking and Verification In order to do disable per-package verification Pkgmgr style, you will need to use :ref:`BoundEntries `, e.g.:: + .. code-block:: xml @@ -461,14 +470,14 @@ Yum package groups are supported by the native Yum libraries. To include a package group, use the ``group`` attribute of the ``Package`` tag. You can use either the short group ID or the long group name:: - + .. code-block:: xml By default, only those packages considered the "default" packages in a group will be installed. You can change this behavior using the "type" attribute:: - + .. code-block:: xml @@ -495,7 +504,7 @@ Bcfg2 contains explicit support for repositories managed by Pulp (http://pulpproject.org/). Due to the amount of data about a repository that can be retrieved directly from Pulp, the only thing necessary to configure a Pulp repo is the repo ID:: - + .. code-block:: xml @@ -575,13 +584,6 @@ Once the server is started, enable debugging via bcfg2-admin:: $ bcfg2-admin xcmd Packages.toggle_debug -TODO list -========= - -* Zypper support -* Portage support -* Explicit version pinning (a la Pkgmgr) - Developing for Packages ======================= -- cgit v1.2.3-1-g7c22 From b66a853214a987dc0c0b2f482efa4df03f6e94da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2012 17:38:43 +0100 Subject: Minor layout changes --- doc/getting_started/index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/getting_started/index.txt b/doc/getting_started/index.txt index e7075c33f..034584014 100644 --- a/doc/getting_started/index.txt +++ b/doc/getting_started/index.txt @@ -236,7 +236,7 @@ Next Steps Several other utilities can help from this point on: :ref:`bcfg2-info ` is a utility that -instantiates a copy of the bcfg2 server core (minus the networking code) +instantiates a copy of the Bcfg2 server core (minus the networking code) for examination. From this, you can directly query: * Client Metadata -- cgit v1.2.3-1-g7c22 From bc657f0134c6154fb91b8749ac8361fe56c29611 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jan 2012 00:45:39 +0100 Subject: Minor layout changes --- doc/server/admin/bundle.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/server/admin/bundle.txt b/doc/server/admin/bundle.txt index 101666bb9..6f4ab55d0 100644 --- a/doc/server/admin/bundle.txt +++ b/doc/server/admin/bundle.txt @@ -8,13 +8,15 @@ bundle For a list of all available xml bundles use ``list-xml``. ``list-genshi`` will list all available genshi bundles.:: - # bcfg2-admin bundle list-xml - # bcfg2-admin bundle list-genshi +.. code-block:: sh + # bcfg2-admin bundles list-xml + # bcfg2-admin bundles list-genshi ``show`` provides an interactive dialog to get details about the available bundles.:: - # bcfg2-admin bundle show +.. code-block:: sh + # bcfg2-admin bundles show Available bundles (Number of bundles: 4) ---------------------------------------- [0] motd.xml -- cgit v1.2.3-1-g7c22 From 1b55c01d830c4cbfe041790e5c6540bc3394ef04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Feb 2012 12:09:55 +0100 Subject: Path fixed --- redhat/systemd/bcfg2-server.service | 2 +- redhat/systemd/bcfg2.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/redhat/systemd/bcfg2-server.service b/redhat/systemd/bcfg2-server.service index 641b02ec6..1fd035fcb 100644 --- a/redhat/systemd/bcfg2-server.service +++ b/redhat/systemd/bcfg2-server.service @@ -7,7 +7,7 @@ Type=forking StandardOutput=syslog StandardError=syslog EnvironmentFile=-/etc/sysconfig/bcfg2 -ExecStart=/usr/bin/bcfg2-server $OPTIONS +ExecStart=/usr/sbin/bcfg2-server $OPTIONS [Install] WantedBy=multi-user.target diff --git a/redhat/systemd/bcfg2.service b/redhat/systemd/bcfg2.service index a0c3afd81..572391fd0 100644 --- a/redhat/systemd/bcfg2.service +++ b/redhat/systemd/bcfg2.service @@ -7,7 +7,7 @@ Type=forking StandardOutput=syslog StandardError=syslog EnvironmentFile=-/etc/sysconfig/bcfg2 -ExecStart=/usr/bin/bcfg2 $OPTIONS +ExecStart=/usr/sbin/bcfg2 $OPTIONS [Install] WantedBy=multi-user.target -- cgit v1.2.3-1-g7c22 From a1409e43bd61866d1b57159a562c24597e3a5e42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 May 2012 18:37:07 +0200 Subject: updated --- doc/appendix/guides/centos.txt | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/appendix/guides/centos.txt b/doc/appendix/guides/centos.txt index fc0354bf9..a4be1a6d9 100644 --- a/doc/appendix/guides/centos.txt +++ b/doc/appendix/guides/centos.txt @@ -4,29 +4,30 @@ .. _appendix-guides-centos: -===================== -Quickstart for CentOS -===================== +=========================================== +CentOS, Scientific Linux, other RHEL clones +=========================================== -This is a complete getting started guide for CentOS. With this document -you should be able to install a Bcfg2 server and a Bcfg2 client. +This is a complete getting started guide for CentOS, Scientific Linux, other +Red Hat Enterprise Linux clones. With this document you should be able to +install and configure a Bcfg2 server and a Bcfg2 client. Install Bcfg2 ============= -The fastest way to get Bcfg2 onto your system is to use Yum or -your preferred package management tool. We'll be using the ones -that are distributed through EPEL_, but depending on your aversion -to risk you could download an RPM from other places as well. See -:ref:`getting_started-using_bcfg2-with-centos` for information about -building Bcfg2 from source and making your own packages. +The fastest way to get Bcfg2 onto your system is to use Yum or your preferred +package management tool. In this quide the packages that are distributed +through EPEL_, but depending on your aversion to risk you could download an +RPM from other places as well. See +:ref:`getting_started-using_bcfg2-with-centos` for information about building +Bcfg2 from source and making your own packages. Using EPEL ---------- .. warning:: - EPEL has outdated versions of the server package for centos5 and + EPEL has outdated versions of the server package for CentOS 5 and earlier. This guide is intended to be used with versions 1.0.0 and higher. Please consider building a newer RPM if you are following this guide. @@ -35,7 +36,11 @@ Make sure EPEL_ is a valid repository on your server. The `instructions `_ on how to do this basically say:: - [root@centos ~]# rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm +EPEL_ for 5.x :: + [root@config ~]# rpm -Uvh http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm + +EPEL_ for 6.x :: + [root@config ~]# rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-5.noarch.rpm .. note:: @@ -44,7 +49,7 @@ basically say:: Install the bcfg2-server and bcfg2 RPMs:: - [root@centos ~]# yum install bcfg2-server bcfg2 + [root@config ~]# yum install bcfg2-server bcfg2 Your system should now have the necessary software to use Bcfg2. The next step is to set up your Bcfg2 :term:`repository`. @@ -60,8 +65,8 @@ is a tool which allows you to automate this:: Store bcfg2 configuration in [/etc/bcfg2.conf]: Location of bcfg2 repository [/var/lib/bcfg2]: Input password used for communication verification (without echoing; leave blank for a random): - What is the server's hostname: [centos] - Input the server location [https://centos:6789]: + What is the server's hostname: [config.your.network] + Input the server location [https://config.your.network:6789]: Input base Operating System for clients: 1: Redhat/Fedora/RHEL/RHAS/Centos 2: SUSE/SLES @@ -77,7 +82,7 @@ is a tool which allows you to automate this:: writing new private key to '/etc/bcfg2.key' ----- Signature ok - subject=/C=US=ST=Illinois/L=Argonne/CN=centos + subject=/C=US=ST=Illinois/L=Argonne/CN=config.your.network Getting Private key Repository created successfuly in /var/lib/bcfg2 -- cgit v1.2.3-1-g7c22