summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add examples for the "include" and "extends" tags in Jinja2.Gordon Messmer2014-11-172-0/+115
|
* Add loader/environment to Jinja2 templates so that files canGordon Messmer2014-11-062-13/+77
| | | | include or extend other files.
* Merge branch 'fix-lint' of https://github.com/AlexanderS/bcfg2Sol Jerome2014-10-3114-38/+65
|\
| * Lint: fix default value for lint_pluginsAlexander Sulfrian2014-10-309-30/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit tricky because we need the enabled server plugins for the default value. To have these available before parsing lint_plugins the server plugins needs to be parsed during early parsing mode. Additional there are lint plugins that has no matching server plugin. To identify them, this adds a reference from the lint plutins to the name of the matching server plugins in the member variable __serverplugin__. If this variable is None the plugin is always used. If a lint plugin could not be imported (maybe because of a missing dependency) the plugin is ignored and not considered as a default value.
| * Lint: handle KeyboardInterupt during fam eventsAlexander Sulfrian2014-10-301-2/+2
| | | | | | | | | | | | | | If a KeyboardInterupt occurs during block_for_fam_events core.shutdown() has to be called. block_For_fam_events will start the fam thread and if shutdown is not called the main thread will stop on an exception and python will wait until the fam thread stops (never).
| * Lint/Comments: add missing optionsAlexander Sulfrian2014-10-301-1/+9
| |
| * Lint/Comments: fix typo in optionsAlexander Sulfrian2014-10-301-2/+2
| |
| * Lint: remove executable bit from source filesAlexander Sulfrian2014-10-302-0/+0
| |
| * Lint/TemplateAbuse: we need the <Info> elementAlexander Sulfrian2014-10-301-1/+1
| |
| * Lint/TemplateAbuse: fix access to FileInfo xml dataAlexander Sulfrian2014-10-302-2/+2
| |
| * Lint/Validate: fix default schema pathAlexander Sulfrian2014-10-291-1/+1
| |
* | doc: remove duplicate contentAlexander Sulfrian2014-10-291-14/+0
|/
* Fix missing import line for django.core.management.Matt Kemp2014-10-281-0/+1
|
* YUM.py: Fix tracebacks from 00a15600Sol Jerome2014-10-281-6/+6
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Fix nondeterministic bruteforce_decrypt testChris St. Pierre2014-10-271-3/+21
| | | | | | | | | | | | The existing test_bruteforce_decrypt was nondeterministic; in some cases, the generated ciphertext would be decryptable with one of the wrong passphrases, which would cause test failure even though it decrypts to gibberish. This checks that by splitting it into two tests: 1. Test with an invalid ciphertext, so that EVPError is always raised; 2. Test with valid ciphertext, and check for *either* EVPError or decrypted plaintext that is not the same as the original plaintext.
* Merge pull request #227 from AlexanderS/update-manChris St. Pierre2014-10-271-0/+4
|\ | | | | man/bcfg2.conf.5: updated man page
| * man/bcfg2.conf.5: updated man pageAlexander Sulfrian2014-10-271-0/+4
| | | | | | | | | | Commit 73037d1f2a193b61fd59724ce81760bfe2f50348 adds a new entry to the man page in the rst source file. This updates the generated man page.
* | Merge pull request #225 from AlexanderS/fix-stats-only-importantChris St. Pierre2014-10-271-5/+11
|\ \ | | | | | | Client: fix statistics for only-important mode
| * | Client: fix statistics for only-important modeAlexander Sulfrian2014-10-261-5/+11
| |/ | | | | | | Do not report non-important entries as bad entries in only-important mode.
* | Merge pull request #224 from AlexanderS/fix-aclChris St. Pierre2014-10-271-0/+1
|\ \ | |/ |/| Server/Plugins/ALC: do not require a name attribute
| * Server/Plugins/ALC: do not require a name attributeAlexander Sulfrian2014-10-261-0/+1
|/
* Fixed client tool tests on systems without /bin/trueChris St. Pierre2014-10-201-1/+10
|
* Fixed py2.6-ism properlyChris St. Pierre2014-10-201-2/+6
|
* removed python 2.6-ismChris St. Pierre2014-10-201-2/+2
|
* Set option types on YUM/RPM list optionsChris St. Pierre2014-10-202-4/+6
|
* Merge pull request #216 from jsbillings/yum-plugin-masterChris St. Pierre2014-10-201-0/+20
|\ | | | | YUM: Add options to enable and disable Yum plugins
| * YUM: Add options to enable and disable Yum pluginsJonathan Billings2014-10-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | Adds two options you can define: * disabled_plugins: A comma-separated list of plugins to disable * enabled_plugins: A comma-separated list of plugins to enable This allows you to run bcfg2 with certain plugins enabled or disabled when they're not set that way in the yum configuration. This is useful because the Bcfg2 YUM plugin is initialized before it can read in any files that might overwrite yum plugin configuration.
* | Merge pull request #218 from AlexanderS/fix-argumentsChris St. Pierre2014-10-201-6/+7
|\ \ | | | | | | Client/Proxy: use keyword arguments to match the correct order
| * | Client/Proxy: use keyword arguments to match the correct orderAlexander Sulfrian2014-10-201-6/+7
|/ / | | | | | | | | | | | | | | The XMLRPCTransport __init__ method defines several arguments with default values. The current call missed the use_datetime argument, so that the client_timeout will set the use_datetime paramenter and the protocol option was used as timeout (does not work, because a float is required and raises an exception).
* | doc: Add 1.4.0pre2 release notesSol Jerome2014-10-151-0/+37
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Options: change default communication protocol to xmlrpc/tlsv1Alexander Sulfrian2014-10-155-11/+11
| |
* | doc: remove default values for protocolAlexander Sulfrian2014-10-156-6/+0
| | | | | | | | | | If hard code the default value in your configuration file, it will not change if the default value will change in the code.
* | Options: add missing communication:protocol optionsAlexander Sulfrian2014-10-154-4/+17
| | | | | | | | | | The option was there in bcfg2-1.3.x and is still documented (maybe it just got lost during the options rewrite).
* | testsuite: add test for InfoXML matching for altsrc entriesAlexander Sulfrian2014-10-141-0/+19
| |
* | InfoXML: <Path> filter should match on realpathAlexander Sulfrian2014-10-141-1/+1
| | | | | | | | | | | | | | When using altsrc the name of real file created on the client is now in the realname attribute of the entry. The <Path> filter in the info.xml should match theses if available to set different permissions for the different files created by one template with altsrc.
* | Merge pull request #209 from AlexanderS/fix-password-authChris St. Pierre2014-10-143-14/+16
|\ \ | | | | | | Options/Commmon: remove default values for ssl-key/ssl-cert
| * | Options/Common: remove defaults for ssl-key/ssl-cert on the ClientAlexander Sulfrian2014-10-143-14/+16
| | | | | | | | | | | | | | | | | | | | | With these default values it is impossible to remove the ssl key and ssl cert from the configuration and use password auth. Configuration options could not be condensed in Bcfg2.Options.Common, because Server and Client needs different default values.
* | | testsuite: fix installationChris St. Pierre2014-10-141-4/+5
| | |
* | | testsuite: simplify installation, run pip freeze on failureChris St. Pierre2014-10-143-16/+7
| | |
* | | Merge pull request #205 from AlexanderS/fix-actionChris St. Pierre2014-10-141-1/+1
|\ \ \ | |/ / |/| | Tools/Action: fix typo
| * | Tools/Action: fix typoAlexander Sulfrian2014-10-141-1/+1
| | |
* | | Merge branch 'doc-packages-backends' of https://github.com/AlexanderS/bcfg2Sol Jerome2014-10-142-0/+7
|\ \ \
| * | | doc: add simple documentation for packages:backendsAlexander Sulfrian2014-10-142-0/+7
| |/ /
* | | Merge branch 'fix-pkgng' of https://github.com/AlexanderS/bcfg2Sol Jerome2014-10-142-4/+4
|\ \ \
| * | | Packages: enable Pkgng backend by defaultAlexander Sulfrian2014-10-141-1/+2
| | | |
| * | | Packages/Pkgng: fix arguments of __init__Alexander Sulfrian2014-10-131-3/+2
| | | | | | | | | | | | | | | | | | | | This plugin was developed for 1.3.x and during the transition to master the changed arguments of Collection.__init__ were missed.
* | | | TestDecisions: fix testAlexander Sulfrian2014-10-141-4/+4
| | | | | | | | | | | | | | | | | | | | The test uses both variants: get_decisions and get_decision. So there is no way to fix the code without fixing the test.
* | | | Server/Plugins/Decisions: fix typoSol Jerome2014-10-131-1/+1
| |/ / |/| | | | | | | | | | | | | | Modified from github #204. Thanks to Alexander Sulfrain. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | | Merge pull request #200 from AlexanderS/fix-docChris St. Pierre2014-10-132-4/+4
|\ \ \ | | | | | | | | doc: replace tabs with spaces
| * | | doc: replace tabs with spacesAlexander Sulfrian2014-10-132-4/+4
|/ / /