summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-extra-packages' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-03-184-11/+11
|\
| * Reporting/Storage: Fix handling of extra packages.Alexander Sulfrian2015-02-191-6/+5
| | | | | | | | | | | | | | The code before for extra packages only worked for rpms because it only evaluated the version information of the contained <Instance> tag and droped the package if no one was avilable. Now the handling of <Instance> is optional and the package is imported everytime.
| * Client/Tools: Report the version of extra packages as current_version.Alexander Sulfrian2015-02-193-5/+6
| | | | | | | | | | The version of extra packages should be reported as current_version and not as target_version.
* | Merge pull request #268 from gordonmessmer/masterChris St. Pierre2015-03-041-17/+54
|\ \ | | | | | | Update to patterns used in chkconfig module
| * | Fix long line for test suite.Gordon Messmer2015-03-031-1/+2
| | |
| * | Add newline to fix test suite.Gordon Messmer2015-03-031-1/+1
| | |
| * | Fix long lines and additional changes for readability.Gordon Messmer2015-03-031-23/+27
| | |
| * | Improve systemd module so that it resembles more mature modules.Gordon Messmer2015-03-031-13/+45
|/ /
* | Client/Tools/APT: Fix regression of ee4111fcAlexander Sulfrian2015-02-231-1/+1
| | | | | | | | | | In ee4111fc we removed the wrong continue (the one after the if/else block for newapi) and now we get an error that 'auto' is not an available version.
* | Client/Tools/Pkgng: No auto-update on pkg-search.Alexander Sulfrian2015-02-191-1/+1
|/ | | | | | By default pkg search will update the local copy of the repository catalogue from remote. We are executing a lot of searches and do not want to update the catalogue every time.
* Merge pull request #250 from stpierre/blanket-except-plugins-lintChris St. Pierre2015-02-1837-271/+260
|\ | | | | Remove blanket excepts from plugins and lint
| * Remove blanket excepts from plugins and lintChris St. Pierre2015-02-1837-271/+260
| | | | | | | | | | | | | | | | | | | | This removes most blanket except: clauses from all plugins, including the base plugin libraries, and bcfg2-lint. The few that remain should all be necessary. Most of the changes were quite minor, but this did require some restructuring of the CfgPrivateKeyCreator; as a result, the tests for that module were rewritten.
* | Merge pull request #261 from AlexanderS/fix-decisionsChris St. Pierre2015-02-182-3/+6
|\ \ | | | | | | Fix Decisions Plugin
| * | FileMonitor/Pseudo: Only produce exists events, if file exists.Alexander Sulfrian2015-02-171-1/+2
| | | | | | | | | | | | | | | | | | The pseudo filemonitor created exists events, even if the file does not exists and the event handler raises an exception. Not it simply ignores non existing files and does not confuse the user with error messages.
| * | Server/Plugins/Decisions: Monitor files for changes.Alexander Sulfrian2015-02-171-2/+4
| |/ | | | | | | | | | | StructFile does not monitor the files by default and without the monitor we does not get the content. So we need to supply should_monitor=True to the StructFile.
* | Merge pull request #260 from jcftang/plugin-homebrewChris St. Pierre2015-02-182-0/+55
|\ \ | |/ |/| Plugin homebrew
| * Add homebrew package managementJimmy Tang2015-02-182-0/+55
|/ | | | Signed-off-by: Jimmy Tang <jcftang@gmail.com>
* Remove unnecessary suppression of apt warningsChris St. Pierre2015-02-171-5/+0
| | | | | This is no longer necessary in 12.04, so should be safe to remove. If you're on Ubuntu < 12.04, upgrade for heaven's sake.
* more pylint fixesChris St. Pierre2015-02-172-8/+12
|
* one more pylint fixChris St. Pierre2015-02-171-2/+2
|
* Pylint fixes for pylint 0.28Chris St. Pierre2015-02-1714-60/+68
| | | | | This also pins Pylint to 0.28 or older so that we don't have to do this again. At some point we should look at upgrading to Pylint 1.x.
* DBSettings: Fix time_zone option.Alexander Sulfrian2015-01-282-3/+3
| | | | | In the documentation, in the 1.3.x version and in django this option is called time_zone (and not timezone). There is no reason to change this.
* doc: Fix typoSol Jerome2015-01-031-1/+1
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Merge branch 'bundle-modification-deps' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-01-037-28/+187
|\ | | | | | | | | Conflicts: src/lib/Bcfg2/Client/__init__.py
| * Bundler: modification is now the boolean inherit_modificationAlexander Sulfrian2014-11-254-17/+12
| |
| * testsuite: add test for modification inheritanceAlexander Sulfrian2014-11-251-0/+36
| |
| * Bundler: add modification support to Bundle dependenciesAlexander Sulfrian2014-11-257-28/+156
| | | | | | | | | | | | Bundle dependencies are now realized with RequiredBundle and support inheritance of the modification flag. This requires new client support and will only work with clients >= 1.4.0pre2.
* | doc: Fix title over/underlinesSol Jerome2015-01-022-4/+6
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | testsuite/common.py: Default to using unittest2Sol Jerome2014-12-191-2/+2
| | | | | | | | | | | | Only fallback to unittest if unittest2 is unavailable. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Server/Plugin/helpers: remove track_statisticsAlexander Sulfrian2014-12-134-47/+11
| | | | | | | | Bcfg2.Server.Statistics.track_statistics was identical.
* | Merge branch 'fix-client-keyboard-interrupt' of ↵Sol Jerome2014-12-092-0/+12
|\ \ | | | | | | | | | https://github.com/AlexanderS/bcfg2
| * | Bcfg2/Client: do not catch KeyboardInterruptAlexander Sulfrian2014-11-252-0/+12
| |/ | | | | | | | | Wildcard excepts should explicitly exclude KeyboardInterrupt, so that the process exits if the user wants it.
* | Server/Plugins/Metadata: add remove_client to rmi methodsAlexander Sulfrian2014-12-081-1/+2
| |
* | Server/SSLServer: allow None as return valueAlexander Sulfrian2014-12-081-1/+1
| |
* | Server/Plugins/Metadata: add list_clients to rmi methodsAlexander Sulfrian2014-11-301-0/+1
| |
* | Server/SSLServer: allow set as return valueAlexander Sulfrian2014-11-301-1/+3
| | | | | | | | | | xmlrpclib does not handle sets as return values. So we have to convert it to a list before returning it.
* | NagiosGen: Fix typo in b1b6b5aeSol Jerome2014-11-261-1/+0
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | NagiosGen: Add bundles to configurationSol Jerome2014-11-262-1/+10
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Bcfg2/Server/Admin: fix the Help subcommandAlexander Sulfrian2014-11-251-1/+3
| | | | | | | | | | At least the Help subcommand does not provide a setup method. So we need to exclude if from the setup() call.
* | Merge branch 'fix-version' of https://github.com/AlexanderS/bcfg2Sol Jerome2014-11-252-2/+16
|\ \
| * | Bcfg2/Options/Parser: fix --version option, add testAlexander Sulfrian2014-11-252-2/+16
| |/
* | Merge pull request #243 from AlexanderS/fix-missing-bundleChris St. Pierre2014-11-201-1/+2
|\ \ | |/ |/| Server/Core: fix missing bundle error
| * Server/Core: fix missing bundle errorAlexander Sulfrian2014-11-211-1/+2
|/ | | | | | Bundles could be converted into Independent tags, so we need to check Bundle and Independent elements in the generated structure to find all requested bundles.
* Merge branch 'include2' of https://github.com/gordonmessmer/bcfg2Sol Jerome2014-11-174-13/+192
|\
| * 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.
* | Client/Tools/APT: some syntax cleanupAlexander Sulfrian2014-11-161-15/+13
| |
* | Client/Tools/APT: use more modern python-apt APIAlexander Sulfrian2014-11-161-9/+2
| | | | | | | | python-apt provides a public API for all required steps.
* | Client/Tools/APT: use "pkg in cache" everywhereAlexander Sulfrian2014-11-161-3/+3
| | | | | | | | | | The "in syntax" is supported instead of the cache.has_key(pkg) syntax at least since python-apt-0.7.91.
* | Revert "APT: add backwards compatibility for python-apt 0.6"Alexander Sulfrian2014-11-161-9/+2
| | | | | | | | This reverts commit 81cc9e874928ee97283cbf501b4ffd3917f1f476.