summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Include recent changes in RPM spec dependencies.Gordon Messmer2015-09-131-2/+9
|
* Compatibility with Jinja < 2.7.Gordon Messmer2015-09-091-3/+9
|
* Keep trailing newlines in Jinja2 templates.Gordon Messmer2015-09-091-1/+3
|
* Merge branch 'no-django' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-09-011-2/+4
|\
| * DBSettings: Don't use django, if it's not availableAlexander Sulfrian2015-07-201-2/+4
| |
* | Merge branch 'rules-replace_name' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-09-019-11/+116
|\ \
| * | testsuite: Fix debug messages to handle xml with a '%' insideAlexander Sulfrian2015-08-261-9/+10
| | |
| * | Rules: New options replace_name to replace %{name} in attributesAlexander Sulfrian2015-08-268-2/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use the regex feature of Rules/Defaults you may need the real name of the matched entry in an attribute (for example home of POSIXUser). You can now enable replace_name for rules or defaults and %{name} will be replaces in the attribues of the Element before adding them to the target entry. This allows you to write something like that in Defaults to assing a default home directory somewhere else to all users with unset home: <POSIXUser name='.*' home='/somewhere/%{name}'/>
* | | Merge pull request #304 from s19n/masterChris St. Pierre2015-09-011-3/+1
|\ \ \ | | | | | | | | doc: update Genshi 'name' attribute description
| * | | doc: update Genshi 'name' attribute descriptions19n2015-08-071-3/+1
|/ / /
* | | Merge branch 'no-jinja2' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-281-14/+15
|\ \ \
| * | | Plugins/Cfg: Don't depend on jinja2Alexander Sulfrian2015-07-201-14/+15
| | |/ | |/| | | | | | | | | | If jinja2 is not available, we cannot use some classes. So the access to these classes have to be dependent on the available of jinja2.
* | | Merge pull request #292 from AlexanderS/fix-options-defaultChris St. Pierre2015-07-283-2/+14
|\ \ \ | | | | | | | | Options: Set default values from config, right after adding a new option
| * | | Options: Add test to use config value for options from loaded componentsAlexander Sulfrian2015-07-222-2/+11
| | | |
| * | | Options: Set default values from config, right after adding a new optionAlexander Sulfrian2015-07-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If adding an option during the "Main Parser Loop" (for example because of loading a component for bcfg-lint) a value for the option from the config file is simply ignored. After adding the option, the parser first tries to find the value in the command line, but cannot find it and set the default value from the source code as option value. After that the value from the config file is set as new default, but because the option already is in the Namespace, it does not use the new "default" value from the config file. This patch simply sets the default value from the config file for the new options, right after adding it to the parser and so the correct value is used afterwards, if the parser cannot find the flag on the command line.
* | | | Merge pull request #302 from AlexanderS/fix/logging-with-daemonChris St. Pierre2015-07-281-1/+20
|\ \ \ \ | | | | | | | | | | BuiltinCore: Fix logging with daemonization
| * | | | BuiltinCore: Fix logging with daemonizationAlexander Sulfrian2015-07-281-1/+20
|/ / / / | | | | | | | | | | | | | | | | python-daemon closes all open files, so we need to specify the filehandles of the log files to keep logging working.
* | | | Merge branch 'fix/systemd-ignore' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-281-1/+1
|\ \ \ \
| * | | | Client/Tools/Systemd: Do not stop services if status is set to ignoreAlexander Sulfrian2015-07-271-1/+1
| | | | |
* | | | | Ldap: Run full code style checks agains the pluginAlexander Sulfrian2015-07-241-1/+0
| | | | |
* | | | | Ldap: Complete renew of the Ldap pluginAlexander Sulfrian2015-07-245-255/+267
| | | | |
* | | | | Utils: Generalize safe_module_nameAlexander Sulfrian2015-07-244-23/+33
|/ / / / | | | | | | | | | | | | | | | | Other plugins that also import user generated python source code, may want to use safe_module_name from TemplateHelper.
* | | | Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-2313-40/+54
|\ \ \ \
| * | | | testsuite/common: Add the new option.Alexander Sulfrian2015-07-231-0/+1
| | | | |
| * | | | DBSettings: Add possibility to specify arbitrary django options.Alexander Sulfrian2015-07-233-1/+18
| | | | |
| * | | | Reporting/templates: Use configurable date formats.Alexander Sulfrian2015-07-236-6/+12
| | | | |
| * | | | Options/Types: Fix database OPTIONS parsingAlexander Sulfrian2015-07-234-33/+23
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly from 257eb0c17 and 16d3e04cb to allow for setting arbitrary database options since some settings require nested dictionaries, etc. This got lost during merge from maint into master because of the completely different Options parsing.
* | | | Merge branch 'merge-files-ignore-binary' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-225-39/+43
|\ \ \ \ | |/ / / |/| | |
| * | | tests: is_string is now in Bcfg2.UtilsAlexander Sulfrian2015-07-222-22/+21
| | | |
| * | | Utils: Generalize is_string from POSIX/FileAlexander Sulfrian2015-07-223-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | is_string from POSIX/File could be used in other situations, too. So we move it to Utils, use it from Lint/MergeFiles and replace a custom is_binary function.
| * | | Lint/MergeFiles: Ignore binary filesAlexander Sulfrian2015-07-211-0/+7
| |/ / | | | | | | | | | | | | Ignore files with binary content, because SequenceMatcher seems to have problems and sometimes detect files with different content as identically.
* | | Merge branch 'fix-defaults' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-211-1/+2
|\ \ \ | |/ / |/| |
| * | PrioDir: Only set text content, if something is availableAlexander Sulfrian2015-07-211-1/+2
| |/ | | | | | | | | | | This is used for the Rules and Defaults plugins. Without this patch all text content that was there before (for example file content bound by Cfg) is lost, for all entries specified in Defaults.
* | Merge pull request #288 from AlexanderS/fix-toolsChris St. Pierre2015-07-212-7/+11
|\ \ | |/ |/| Fix some issues with new Options parser in tools/
| * tools: components of a Options parser sould be a listAlexander Sulfrian2015-07-201-1/+1
| |
| * tools: Fix issue introduced in cd14868d with new parser for OptionsAlexander Sulfrian2015-07-202-6/+10
|/ | | | | | The new parser creates the the full plugin classes out of the options, so we need to use the __name__ attribute to get the name of the plugin and the directory containing the files in the repository.
* Merge branch 'maint'Alexander Sulfrian2015-06-1226-99/+358
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: debian/changelog doc/conf.py misc/bcfg2-selinux.spec misc/bcfg2.spec osx/Makefile osx/macports/Portfile 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/Tools/APT.py src/lib/Bcfg2/Client/Tools/FreeBSDInit.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/CherrypyCore.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/FileMonitor/__init__.py src/lib/Bcfg2/Server/Lint/Validate.py src/lib/Bcfg2/Server/Lint/__init__.py src/lib/Bcfg2/Server/MultiprocessingCore.py src/lib/Bcfg2/Server/Plugin/__init__.py src/lib/Bcfg2/Server/Plugins/GroupPatterns.py src/lib/Bcfg2/Server/Plugins/Metadata.py src/lib/Bcfg2/Server/Plugins/Packages/Source.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/Server/Plugins/SSHbase.py src/lib/Bcfg2/Server/Plugins/SSLCA.py src/lib/Bcfg2/version.py src/sbin/bcfg2-info src/sbin/bcfg2-test testsuite/requirements.txt
| * Version bump to 1.3.6Sol Jerome2015-06-1116-16/+22
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * doc: Add more 1.3.6 release notesSol Jerome2015-06-111-1/+8
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Reporting: Fix plus/minusSol Jerome2015-06-111-2/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * docs: TemplateHelper forgot how to sentenceChris St. Pierre2015-05-081-3/+3
| |
| * Merge branch 'fix-yum-packages-traceback' into maintSol Jerome2015-04-281-4/+9
| |\
| | * Yum.py: Add debug log messageSol Jerome2015-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | Log a message to debug if the package is missing from the host's primary architecture package list (as per Chris's request). Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Yum.py: Fix traceback when arch missingSol Jerome2014-11-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes repositories may not contain packages for a specific architecture group. This handles that case gracefully instead of causing a traceback and failing to bind all Package entries. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | Merge pull request #276 from gaurdro/fix-secontext-not-supportedChris St. Pierre2015-04-212-20/+37
| |\ \ | | | | | | | | handle filesystem secontexts properly for contextless filesystems
| | * | handle filesystem secontexts properly for contextless filesystemsRoss Smith2015-04-162-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - adds 'secontext_ignore' under POSIX in the configuration file - short circuits on filesystems that are known not to support file labels - defaults to filesystems that have a genfs command in selinux reference policy - checks for Operation not supported while setting a file label - fixes #275
| * | | Reporting: Fix typoSol Jerome2015-04-171-1/+1
| |/ / | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | FreeBSDInit: Fix __init__ callSol Jerome2015-04-091-1/+1
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | Yum.py: Compare epoch/version/release separatelySol Jerome2015-03-311-6/+15
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | Packages/Yum.py: Fix dependency resolution logicSol Jerome2015-03-301-2/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit helps the internal YUM resolver to choose the latest version of a package to generate dependencies. Previously, we were simply iterating through the file so that the last instance listed always won (even if that instance was an older version with differing dependencies). Signed-off-by: Sol Jerome <sol.jerome@gmail.com>