summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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.
* | Client/Tools/APT: remove all the stuff for the old APIAlexander Sulfrian2014-11-163-56/+19
| |
* | Merge branch 'maint'Alexander Sulfrian2014-11-1239-214/+463
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: debian/changelog doc/conf.py doc/releases/index.txt doc/server/database.txt doc/server/plugins/generators/cfg.txt doc/server/plugins/generators/sslca.txt man/bcfg2.conf.5 misc/bcfg2-selinux.spec misc/bcfg2.spec osx/Makefile osx/macports/Portfile schemas/packages.xsd solaris-ips/MANIFEST.bcfg2-server.header solaris-ips/MANIFEST.bcfg2.header solaris-ips/Makefile solaris-ips/pkginfo.bcfg2 solaris-ips/pkginfo.bcfg2-server solaris/Makefile solaris/pkginfo.bcfg2 solaris/pkginfo.bcfg2-server src/lib/Bcfg2/Client/Client.py src/lib/Bcfg2/Client/Proxy.py src/lib/Bcfg2/Client/Tools/APT.py src/lib/Bcfg2/Client/Tools/Action.py src/lib/Bcfg2/Client/Tools/SYSV.py src/lib/Bcfg2/Client/Tools/YUM.py src/lib/Bcfg2/Client/Tools/__init__.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Reporting/Collector.py src/lib/Bcfg2/Reporting/templates/base.html src/lib/Bcfg2/Server/Admin/__init__.py src/lib/Bcfg2/Server/BuiltinCore.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugins/Packages/Apt.py src/lib/Bcfg2/Server/Plugins/Probes.py src/lib/Bcfg2/settings.py src/lib/Bcfg2/version.py testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py testsuite/Testsrc/test_code_checks.py
| * \ Merge branch 'fix-django-db-options-parsing' into maintSol Jerome2014-11-105-42/+32
| |\ \
| | * | Options.py: Fix database OPTIONS parsingSol Jerome2014-11-045-42/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <sol.jerome@gmail.com>
| * | | Client/Tools/APT: fix pylint errors, enable checkAlexander Sulfrian2014-11-102-63/+83
| | | | | | | | | | | | | | | | | | | | | | | | Previously pep8/pylint checks were disable for the APT tool because there were to many errors. This fix the pylint errors and enables the code style checks.
| * | | Client/Tools/APT: fix exception nameAlexander Sulfrian2014-11-101-1/+1
| | | |
| * | | Merge branch 'SYSV-use-simplefile' of https://github.com/fennm/bcfg2 into maintSol Jerome2014-11-084-10/+72
| |\ \ \
| | * | | SYSV: add a migration tool to change simplename attributes to simplefileMichael Fenn2014-11-072-0/+55
| | | | |
| | * | | doc: Update SYSV datastream format docsMichael Fenn2014-11-061-3/+11
| | | | |
| | * | | SYSV: change instances of simplename to simplefileMichael Fenn2014-11-062-8/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge branch 'handle-apt-update-exceptions' of ↵Sol Jerome2014-11-061-1/+5
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/AlexanderS/bcfg2 into maint
| | * | | Client/Tools/APT: handle exceptions gracefullyAlexander Sulfrian2014-11-051-1/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | Exceptions during cache update (in kevlar mode) should not prevent the client tool from initializing. In the worst case the old cache would be used for the client run.
| * | | Server/Plugins/Packages: add debsrc attribute to url_mapAlexander Sulfrian2014-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | Adding this value to the url_map makes it possible to use it in genshi templates.
| * | | schemas/packages.xsd: add default value for debsrcAlexander Sulfrian2014-11-051-1/+1
| |/ /
| * | doc: Fix typosSol Jerome2014-11-031-8/+8
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | doc: Add note about Decisions fix for 1.3.6Sol Jerome2014-10-311-0/+1
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>