summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Chris St. Pierre2013-09-166-68/+150
|\ | | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Plugins/Cfg/CfgPublicKeyCreator.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
| * CfgPublicKeyCreator: properly handle case where only private key has been ↵Chris St. Pierre2013-09-164-57/+137
| | | | | | | | | | | | | | | | | | created Previously, only two cases were handled properly: both public and private keys had been created; or neither had been created. If the private key had been created (e.g., manually added to the repo), the public key would not be created from it. This fixes that.
| * Remove all ACLs (including mask) from entries with no ACLs listedChris St. Pierre2013-09-121-0/+5
| | | | | | | | | | | | When installing an entry with no ACLs specified, but with ACLs on the file as it exists on the filesystem, the ACL mask was preserved, even as the ACLs are deleted.
| * XMLFileBacked: removed unused variableChris St. Pierre2013-09-111-1/+1
| |
| * XMLFileBacked: Fixed multiple identical XIncludes in one fileChris St. Pierre2013-09-111-12/+9
| |
* | bcfg2-crypt: fixed logic for determining if a encrypt/decrypt failedChris St. Pierre2013-09-131-1/+2
| |
* | bcfg2-crypt: better debug loggingChris St. Pierre2013-09-131-0/+7
| |
* | Encryption: better logging when passphrase for encrypting Properties cannot ↵Chris St. Pierre2013-09-131-7/+10
| | | | | | | | be determined
* | bcfg2-test: only capture debugging output if -d givenChris St. Pierre2013-09-131-1/+2
| |
* | Core: Do not create DefaultACL/ directoryChris St. Pierre2013-09-121-0/+2
| |
* | Merge branch 'maint'Chris St. Pierre2013-09-091-2/+18
|\| | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
| * bcfg2-lint: Added Cfg check for multiple global handlers for one entry setChris St. Pierre2013-09-091-1/+17
| |
* | bcfg2-lint: Fixed bugs in MergeFiles, added check for identical filesChris St. Pierre2013-09-091-21/+56
| |
* | bcfg2-lint: fixed old Cfg API call in Cfg pluginChris St. Pierre2013-09-091-1/+1
| |
* | bcfg2-lint: Fixed name of TemplateHelper lint pluginChris St. Pierre2013-09-091-1/+1
| |
* | Merge branch 'maint'Chris St. Pierre2013-09-097-12/+27
|\| | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Plugins/Cfg/CfgAuthorizedKeysGenerator.py src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
| * Cfg: allow changing category specific-ness of generated authorized_keysChris St. Pierre2013-09-092-3/+12
| |
| * testsuite: add "encoding" to setup for POSIXUsers testsChris St. Pierre2013-09-091-1/+8
| |
| * Cfg: Give non-specific handlers a default specificityChris St. Pierre2013-09-092-5/+9
| |
| * POSIXUsers: Fix tracebackSol Jerome2013-09-061-1/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Core: avoid importing Metadata before Django has been configuredChris St. Pierre2013-09-051-2/+1
| |
* | Filemonitor: Pylint fixSol Jerome2013-09-061-1/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Pylint/PEP8 fixesSol Jerome2013-09-0648-622/+810
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | doc: Remove fam filemonitorSol Jerome2013-09-061-1/+0
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | tools: Fix bash completionSol Jerome2013-09-061-3/+19
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Merge branch 'sort-bcfg2-info-lists' of https://github.com/dhutty/bcfg2Sol Jerome2013-09-061-4/+5
|\ \
| * | ensure that bundles list correctly for clients with 1/many bundlesDuncan Hutty2013-08-121-3/+4
| | |
| * | sort the lists of Groups and Bundles in the output of bcfg2-info showclientDuncan Hutty2013-08-121-2/+2
| | |
* | | Merge branch 'maint'Chris St. Pierre2013-09-053-5/+66
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugins/GroupLogic.py
| * | Allow Connector to create new groupsChris St. Pierre2013-09-053-5/+66
| | | | | | | | | | | | | | | Connector plugins can now create new groups, including the full range of options on those groups (profile, public, category, etc.).
* | | GroupLogic: fixed for 1.4Chris St. Pierre2013-09-051-2/+9
| | |
* | | testsuite: fixed authorized_keys.xml tests with elimination of <Params>Chris St. Pierre2013-09-051-9/+10
| | |
* | | Merge branch 'maint'Chris St. Pierre2013-09-048-29/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/client/tools/actions.txt schemas/authorizedkeys.xsd src/lib/Bcfg2/Client/Frame.py src/lib/Bcfg2/Server/Plugin/helpers.py src/lib/Bcfg2/Server/Plugins/Bundler.py testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
| * | Cfg: More flexible and complete way to specify authorized keys optionsChris St. Pierre2013-09-043-8/+82
| | |
| * | bcfg2_local.py: Fixed addresspair portChris St. Pierre2013-09-041-1/+4
| | |
| * | XMLFileBacked: Monitor XIncludes whenever a FAM is availableChris St. Pierre2013-09-043-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This monitors XIncluded files even if should_monitor=False, since the object monitoring the base file will not monitor XIncludes. This ensures that XIncluded files are properly monitored whenever possible, particularly for Bundler and Properties. This is a partial backport of 5b66845 -- as much of a backport as is possible without a module-level FAM object.
| * | Merge pull request #139 from ↵Chris St. Pierre2013-09-033-10/+29
| |\ \ | | | | | | | | | | | | | | | | kincl/pre-action-processing-with-independent-entries Pre action processing with independent entries
| | * | Fix pep8 errorsJason Kincl2013-08-301-3/+3
| | | |
| | * | doc: Updated Client Actions doc to include BoundActions and anotherJason Kincl2013-08-302-8/+25
| | | | | | | | | | | | | | | | | | | | example schemas: Fixed Action `when` attribute description
| | * | Client: Add entries processed as important to list of entries whenJason Kincl2013-08-301-2/+4
| | | | | | | | | | | | | | | | determining if a bundle has been modified
* | | | Options: parse arg list passed in, not sys.argvChris St. Pierre2013-09-031-1/+1
| | | |
* | | | bcfg2-info: expand null list of hostname globs correctlyChris St. Pierre2013-09-031-1/+1
| | | |
* | | | Cache: added missing docstring on py2.5Chris St. Pierre2013-09-031-0/+1
| | | |
* | | | bcfg2-crypt: Fixed name of config file optionChris St. Pierre2013-09-031-5/+5
| | | |
* | | | Logger: removed debugging print statementChris St. Pierre2013-09-031-1/+0
| | | |
* | | | testsuite: Skip Probes DB tests if django is not availableChris St. Pierre2013-09-031-0/+1
| | | |
* | | | testsuite: removed obsolete can_skip variableChris St. Pierre2013-09-038-390/+369
| | | | | | | | | | | | | | | | | | | | | | | | This was needed when we implemented skipping ourselves in a hackish way; with unittest2, skipping is implemented correctly, so tests can always be skipped
* | | | SSLServer: Don't decode request contentChris St. Pierre2013-09-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This only exists in py2.7+, and only to expand gzipped request content, which the Bcfg2 client doesn't support (and, given the py2.7 requirement, won't any time soon).
* | | | Cache: fixed py2.5 syntax errorChris St. Pierre2013-09-031-1/+4
| | | |
* | | | testsuite: use unittest2 on py<2.7 instead of writing everything ourselvesChris St. Pierre2013-09-032-169/+13
| | | |