From 8aadbb3f6391edc55e0fe40fb5f651b492cd176a Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Fri, 20 Jun 2014 13:26:51 -0400 Subject: Doc: fix repeated word in AWSTags docs --- doc/server/plugins/connectors/awstags.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/server/plugins/connectors/awstags.txt b/doc/server/plugins/connectors/awstags.txt index b884ca065..eed52bacf 100644 --- a/doc/server/plugins/connectors/awstags.txt +++ b/doc/server/plugins/connectors/awstags.txt @@ -7,8 +7,8 @@ ========= The AWSTags plugin is a connector that retrieves tags from instances -in EC2, and can assign optionally assign -group membership pased on patterns in the tags. See `Using Tags +in EC2, and can optionally assign group membership pased on patterns +in the tags. See `Using Tags `_ for details on using tags in EC2. -- cgit v1.2.3-1-g7c22 From c6df1555b359f141b1a2b2c17a05ee7891d9b4a4 Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Fri, 20 Jun 2014 13:34:47 -0400 Subject: Doc: fix spelling error in AWSTags docs --- doc/server/plugins/connectors/awstags.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/server/plugins/connectors/awstags.txt b/doc/server/plugins/connectors/awstags.txt index eed52bacf..5ac2fbc28 100644 --- a/doc/server/plugins/connectors/awstags.txt +++ b/doc/server/plugins/connectors/awstags.txt @@ -7,7 +7,7 @@ ========= The AWSTags plugin is a connector that retrieves tags from instances -in EC2, and can optionally assign group membership pased on patterns +in EC2, and can optionally assign group membership based on patterns in the tags. See `Using Tags `_ for details on using tags in EC2. -- cgit v1.2.3-1-g7c22 From 58e9167a8614e2c549e000b697ca88d5b59b5d7b Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 9 Jul 2014 13:37:56 -0400 Subject: doc: fixed link to ssh key docs --- doc/server/plugins/generators/cfg.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt index 0f0601105..a170f5a80 100644 --- a/doc/server/plugins/generators/cfg.txt +++ b/doc/server/plugins/generators/cfg.txt @@ -600,7 +600,7 @@ Deltas .. warning:: In Bcfg2 1.3, deltas **do not** work with `SSH key or - authorized_keys generation `_. + authorized_keys generation `_. Bcfg2 has finer grained control over how to deliver configuration files to a host. Let's say we have a Group named file-server. Members -- cgit v1.2.3-1-g7c22 From a9fdf3d7e73c4aabc0b5e5710617c0788b9311c8 Mon Sep 17 00:00:00 2001 From: Nathan Olla Date: Mon, 14 Jul 2014 16:05:22 -0400 Subject: Add urlretrieve to Compat and document --- doc/development/compat.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/development/compat.txt b/doc/development/compat.txt index f90274ce5..8700c46d3 100644 --- a/doc/development/compat.txt +++ b/doc/development/compat.txt @@ -60,6 +60,8 @@ behavior (e.g., :func:`input`) do not cause unexpected side-effects. +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | urlparse | :func:`urlparse.urlparse` | :func:`urllib.parse.urlparse` | +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ +| urlretrieve | :func:`urllib.urlretrieve` | :func:`urllib.request.urlretrieve` | ++---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | HTTPBasicAuthHandler | :class:`urllib2.HTTPBasicAuthHandler` | :class:`urllib.request.HTTPBasicAuthHandler` | +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | HTTPPasswordMgrWithDefaultRealm | :class:`urllib2.HTTPPasswordMgrWithDefaultRealm` | :class:`urllib.request.HTTPPasswordMgrWithDefaultRealm` | -- cgit v1.2.3-1-g7c22 From c81ee4a99dfbd65b6ccde5a2d3fee9dd3caf5fc1 Mon Sep 17 00:00:00 2001 From: Nathan Olla Date: Wed, 16 Jul 2014 15:21:07 -0400 Subject: Add some basic documentation for SYSV packages over HTTP --- doc/client/tools.txt | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/client/tools.txt b/doc/client/tools.txt index 1dbb33b1a..11f1d72cc 100644 --- a/doc/client/tools.txt +++ b/doc/client/tools.txt @@ -154,7 +154,32 @@ Systemd service support. SYSV ---- -Handles System V Packaging format that is available on Solaris. +Handles `System V Packaging `_ format that is available on Solaris. + +.. note:: + + If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplename attribute. Such packages will be downloaded and installed from a local path. + + datastream format over HTTP: + + .. code-block:: xml + + + + + + + + File system format over NFS or local path: + + .. code-block:: xml + + + + + + + Upstart ------- -- cgit v1.2.3-1-g7c22 From af0d30e03bcd7c40931aaa27536a75daa18f4134 Mon Sep 17 00:00:00 2001 From: Nathan Olla Date: Wed, 16 Jul 2014 15:27:42 -0400 Subject: Remove group tag from examples --- doc/client/tools.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/client/tools.txt b/doc/client/tools.txt index 11f1d72cc..ce8732454 100644 --- a/doc/client/tools.txt +++ b/doc/client/tools.txt @@ -165,9 +165,7 @@ Handles `System V Packaging - - File system format over NFS or local path: @@ -175,9 +173,7 @@ Handles `System V Packaging - - -- cgit v1.2.3-1-g7c22 From d31f274d51a9486aa9e88d6f225460bfc65094f6 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 17 Jul 2014 09:26:26 -0500 Subject: doc: Fix grammar Signed-off-by: Sol Jerome --- doc/server/plugins/connectors/templatehelper.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/server/plugins/connectors/templatehelper.txt b/doc/server/plugins/connectors/templatehelper.txt index 374aeb171..4b1f66aee 100644 --- a/doc/server/plugins/connectors/templatehelper.txt +++ b/doc/server/plugins/connectors/templatehelper.txt @@ -50,7 +50,7 @@ Usage Specific helpers can be referred to in templates as ``metadata.TemplateHelper[]``. That accesses -a HelperModule object will has, as attributes, all symbols listed in +a HelperModule object will have, as attributes, all symbols listed in ``__export__``. For example, consider this helper module:: __export__ = ["hello"] -- cgit v1.2.3-1-g7c22 From 9aecece53b7cfad6cb0dee4cd729f31f8194751a Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 22 Jul 2014 07:33:59 -0500 Subject: doc: Fix typo Signed-off-by: Sol Jerome --- doc/server/plugins/generators/sslca.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/server/plugins/generators/sslca.txt b/doc/server/plugins/generators/sslca.txt index 7ef358a31..c27e6be4b 100644 --- a/doc/server/plugins/generators/sslca.txt +++ b/doc/server/plugins/generators/sslca.txt @@ -340,7 +340,7 @@ Here's what a functional **[communication]** section in a {% end %}\ As a client will not be able to authenticate with certificates it does -not yet posses we need to overcome the chicken and egg scenario the +not yet possess we need to overcome the chicken and egg scenario the first time we try to connect such a client to the server. We can do so using password based auth to boot strap the client manually specifying all the relevant auth parameters like so:: -- cgit v1.2.3-1-g7c22 From 6a8c393373969313ee1d0538dc5c007cbdbffe1a Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 4 Sep 2014 08:40:27 -0500 Subject: doc: Add 1.3.5 release notes Signed-off-by: Sol Jerome --- doc/releases/1.3.5.txt | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/releases/1.3.5.txt (limited to 'doc') diff --git a/doc/releases/1.3.5.txt b/doc/releases/1.3.5.txt new file mode 100644 index 000000000..893cdbf39 --- /dev/null +++ b/doc/releases/1.3.5.txt @@ -0,0 +1,33 @@ +.. -*- mode: rst -*- +.. vim: ft=rst + +.. _releases-1.3.5: + +1.3.5 +===== + +We are happy to announce the release of Bcfg2 1.3.5. It is available for +download at: + + ftp://ftp.mcs.anl.gov/pub/bcfg + +This is primarily a bugfix release. + +* Properly close db connections +* Improved error messages +* Fix yum upgrade/downgrade +* Enable bcfg2-yum-helper to depsolve for arches incompatible with + server +* Spec file fixes +* bcfg2-crypet: Default to only (En|De)crypt vars that need it +* Fix email reporting bug +* Fix debsums parsing +* Fix solaris makefile +* SYSV: Implement downloading and installing SYSV packages from HTTP: + http://docs.bcfg2.org/client/tools.html#sysv +* Fix debian bcfg2-server init script + + +Special thanks to the following contributors for this release: John +Morris, Jonathan Billings, Chris Brinker, Tim Laszlo, Matt Kemp, Michael +Fenn, Pavel Labushev, Nathan Olla, Alexander Sulfrian. -- cgit v1.2.3-1-g7c22 From a42933a1ddfde4f9164e0e0818c559f8f7c9a5a1 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 5 Sep 2014 07:54:48 -0500 Subject: Version bump to 1.3.5 Signed-off-by: Sol Jerome --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/conf.py b/doc/conf.py index 1b19d92c7..3e877ef80 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -66,7 +66,7 @@ else: # The short X.Y version. version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.3.4' +release = '1.3.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- cgit v1.2.3-1-g7c22 From f2209ac6fb7b86a91e052a33828861cabf185245 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 10 Sep 2014 07:38:11 -0500 Subject: doc: Include the 1.3.5 release notes Signed-off-by: Sol Jerome --- doc/releases/index.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/releases/index.txt b/doc/releases/index.txt index 42a2306f6..1ed644f9c 100644 --- a/doc/releases/index.txt +++ b/doc/releases/index.txt @@ -7,4 +7,5 @@ Release Announcements ===================== +.. include:: 1.3.5.txt .. include:: 1.3.4.txt -- cgit v1.2.3-1-g7c22 From c87ea7ad20eae8d69d6314082181633511f30b67 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 11 Sep 2014 08:24:04 -0400 Subject: strike possibly incorrect docs about genshi/cheetah priority --- doc/server/plugins/generators/cfg.txt | 9 --------- 1 file changed, 9 deletions(-) (limited to 'doc') diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt index a170f5a80..541531581 100644 --- a/doc/server/plugins/generators/cfg.txt +++ b/doc/server/plugins/generators/cfg.txt @@ -297,15 +297,6 @@ processed for any Genshi or Cheetah base file. Cfg/etc/fstab/fstab.H_host.example.com.genshi Cfg/etc/fstab/fstab.G50_server.cheetah -Genshi templates take precence over cheetah templates. For example, if -two files exist named:: - - Cfg/etc/fstab/fstab.genshi - Cfg/etc/fstab/fstab.cheetah - -The Cheetah template is ignored. Exploiting this fact is probably a -pretty bad idea in practice. - You can mix Genshi and Cheetah when using different host-specific or group-specific files. For example:: -- cgit v1.2.3-1-g7c22 From 5c68f95a382fdcd17fb5016a98b7eb7af4e057a6 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 10 Oct 2014 21:07:03 -0500 Subject: doc: Clarify debian bcfg2 versions Signed-off-by: Sol Jerome --- doc/installation/distributions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt index 306439485..5dad4d860 100644 --- a/doc/installation/distributions.txt +++ b/doc/installation/distributions.txt @@ -36,9 +36,9 @@ Just use `pacman` to perform the installation :: Debian ====== -Packages of Bcfg2 are available for Debian Lenny, Debian Squeeze, and -Debian Sid. The fastest way to get Bcfg2 onto your Debian system -is to use ``apt-get`` or ``aptitude``. :: +Packages of Bcfg2 are available for all current versions of Debian. +The fastest way to get Bcfg2 onto your Debian system is to use ``apt-get`` +or ``aptitude``. :: sudo aptitude install bcfg2 bcfg2-server -- cgit v1.2.3-1-g7c22 From 111bb75cf8872cc2bca4b00983c5ea9beffed7ae Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 28 Oct 2014 14:47:34 -0500 Subject: doc: Add 1.3.6 release notes Signed-off-by: Sol Jerome --- doc/releases/1.3.6.txt | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/releases/1.3.6.txt (limited to 'doc') diff --git a/doc/releases/1.3.6.txt b/doc/releases/1.3.6.txt new file mode 100644 index 000000000..edae39d0d --- /dev/null +++ b/doc/releases/1.3.6.txt @@ -0,0 +1,26 @@ +.. -*- mode: rst -*- +.. vim: ft=rst + +.. _releases-1.3.6: + +1.3.6 +===== + +We are happy to announce the release of Bcfg2 1.3.6. It is available for +download at: + + ftp://ftp.mcs.anl.gov/pub/bcfg + +This is primarily a bugfix release. + +* Fix python 2.4 compatibility +* Fix stale lockfile detection and behavior +* Reporting: fix filter urls +* Fix client protocol option handling +* YUM: Add options to enable and disable Yum plugins +* Packages: add name to sources +* Reporting: better exception handling +* Various interrupt handling fixes + +Special thanks to the following contributors for this release: Michael +Fenn, Matt Kemp, Alexander Sulfrian, Jonathan Billings. -- cgit v1.2.3-1-g7c22 From a5c00f1c8f581d3d9b3c76e53404ad3489d15c52 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 31 Oct 2014 07:23:08 -0500 Subject: doc: Add note about Decisions fix for 1.3.6 Signed-off-by: Sol Jerome --- doc/releases/1.3.6.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/releases/1.3.6.txt b/doc/releases/1.3.6.txt index edae39d0d..e27b102bf 100644 --- a/doc/releases/1.3.6.txt +++ b/doc/releases/1.3.6.txt @@ -21,6 +21,7 @@ This is primarily a bugfix release. * Packages: add name to sources * Reporting: better exception handling * Various interrupt handling fixes +* Fix client decision whitelist/blacklist handling Special thanks to the following contributors for this release: Michael Fenn, Matt Kemp, Alexander Sulfrian, Jonathan Billings. -- cgit v1.2.3-1-g7c22 From 84ba7561d9450d05b0dd99b69c16437b29100704 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 3 Nov 2014 09:15:51 -0600 Subject: doc: Fix typos Signed-off-by: Sol Jerome --- doc/server/plugins/generators/sslca.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/server/plugins/generators/sslca.txt b/doc/server/plugins/generators/sslca.txt index c27e6be4b..73527284c 100644 --- a/doc/server/plugins/generators/sslca.txt +++ b/doc/server/plugins/generators/sslca.txt @@ -35,7 +35,7 @@ For SSLCA to work, the openssl.cnf (or other configuration file) for that CA must contain full (not relative) paths. #. Add SSLCA to the **plugins** line in ``/etc/bcfg2.conf`` and - restart the server -- This enabled the SSLCA plugin on the Bcfg2 + restart the server -- This enables the SSLCA plugin on the Bcfg2 server. #. Add a section to your ``/etc/bcfg2.conf`` called ``sslca_foo``, @@ -48,12 +48,12 @@ that CA must contain full (not relative) paths. #. If necessary, add an entry for ``passphrase`` containing the passphrase for the CA's private key. We store this in ``/etc/bcfg2.conf`` as the permissions on that file should have it - only readable by the bcfg2 user. If no passphrase is entry exists, + only readable by the bcfg2 user. If no passphrase entry exists, it is assumed that the private key is stored unencrypted. #. Optionally, Add an entry ``chaincert`` that points to the location of your ssl chaining certificate. This is used when preexisting - certifcate hostfiles are found, so that they can be validated and + certificate hostfiles are found, so that they can be validated and only regenerated if they no longer meet the specification. If you're using a self signing CA this would be the CA cert that you generated. If the chain cert is a root CA cert (e.g., if it is a @@ -118,11 +118,11 @@ Configuration bcfg2.conf ---------- -``bcfg2.conf`` contains miscellaneous configuration options for the -SSLCA plugin. These are described in some detail above in -`getting-started`, but are also enumerated here as a reference. Any -booleans in the config file accept the values "1", "yes", "true", and -"on" for True, and "0", "no", "false", and "off" for False. +``bcfg2.conf`` contains miscellaneous configuration options for the SSLCA +plugin. These are described in some detail above in `getting-started`_, +but are also enumerated here as a reference. Any booleans in the config +file accept the values "1", "yes", "true", and "on" for True, and "0", +"no", "false", and "off" for False. Each directive below should appear at most once in each ``[sslca_]`` section. The following directives are understood: -- cgit v1.2.3-1-g7c22 From 257eb0c174ef2fdaa2015975c5919979afa8da90 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 4 Nov 2014 09:57:08 -0600 Subject: Options.py: Fix database OPTIONS parsing Instead of parsing key/value pairs from bcfg2.conf, this allows the setting of the literal value which is then passed through to django as the value of the OPTIONS setting. This change allows for setting arbitrary options since some settings require nested dictionaries, etc. Signed-off-by: Sol Jerome --- doc/man/bcfg2.conf.txt | 5 ++--- doc/releases/1.3.6.txt | 7 +++++++ doc/server/database.txt | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt index 6faf48a1a..f55540968 100644 --- a/doc/man/bcfg2.conf.txt +++ b/doc/man/bcfg2.conf.txt @@ -736,9 +736,8 @@ control the database connection of the server. Port for database connections. Not used for sqlite3. options - Various options for the database connection. The value is - expected as multiple key=value pairs, separated with commas. - The concrete value depends on the database engine. + Various options for the database connection. The value expected + is the literal value of the django OPTIONS setting. Reporting options ----------------- diff --git a/doc/releases/1.3.6.txt b/doc/releases/1.3.6.txt index e27b102bf..757fbf6f5 100644 --- a/doc/releases/1.3.6.txt +++ b/doc/releases/1.3.6.txt @@ -22,6 +22,13 @@ This is primarily a bugfix release. * Reporting: better exception handling * Various interrupt handling fixes * Fix client decision whitelist/blacklist handling +* Fix database OPTIONS parsing + + This change requires you to set the *options* value of the + ``[database`` section in ``bcfg2.conf`` to the literal value which is + passed through to the django OPTIONS setting. + + https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-OPTIONS Special thanks to the following contributors for this release: Michael Fenn, Matt Kemp, Alexander Sulfrian, Jonathan Billings. diff --git a/doc/server/database.txt b/doc/server/database.txt index 3c8970f68..15c66754f 100644 --- a/doc/server/database.txt +++ b/doc/server/database.txt @@ -51,8 +51,8 @@ of ``/etc/bcfg2.conf``. +-------------+------------------------------------------------------------+-------------------------------+ | options | Extra parameters to use when connecting to the database. | None | | | Available parameters vary depending on your database | | -| | backend. The parameters are supplied as comma separated | | -| | key=value pairs. | | +| | backend. The parameters are supplied as the value of the | | +| | django OPTIONS setting. | | +-------------+------------------------------------------------------------+-------------------------------+ -- cgit v1.2.3-1-g7c22 From dccd33a479c0ff14d90d2939534f91964e1a393c Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Thu, 6 Nov 2014 14:05:42 -0500 Subject: SYSV: change instances of simplename to simplefile This is to better match the schema since simplefile already exists. The previous simplename attribute would fail validation. Since pkgmgr already helpfully constructs url for you if simplefile exists, the tool no longer needs to do the concatenation itself. Given the low usage rate of SYSV.py and that the original functionality was introduced in a late 1.3 release, changing the name w/o providing backwards compatiblity seems reasonable. --- doc/client/tools.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/client/tools.txt b/doc/client/tools.txt index ce8732454..26841ab11 100644 --- a/doc/client/tools.txt +++ b/doc/client/tools.txt @@ -158,14 +158,14 @@ Handles `System V Packaging - + File system format over NFS or local path: -- cgit v1.2.3-1-g7c22 From ddf888ec1237fb27c329f9e667c791ee7c257720 Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Thu, 6 Nov 2014 15:19:18 -0500 Subject: doc: Update SYSV datastream format docs --- doc/client/tools.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/client/tools.txt b/doc/client/tools.txt index 26841ab11..170b30b2e 100644 --- a/doc/client/tools.txt +++ b/doc/client/tools.txt @@ -158,13 +158,21 @@ Handles `System V Packaging ` plugin will + automatically construct the url attribute by concatenating the uri and + simplefile attributes (with an intervening slash). + + Datastream format over HTTP: .. code-block:: xml - + -- cgit v1.2.3-1-g7c22