summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | some more django 1.7 compatibility fixesJonas Jochmaring2015-09-233-14/+19
| | | |
| * | | make Bcfg2-web compatible with django 1.7Jonas Jochmaring2015-09-2313-492/+1061
| | | | | | | | | | | | | | | | | | | | | | | | - reports.wsgi uses get_wsgi_application() now - old south-based migrations have been moved - manage.py has been updated
* | | | Merge branch 'add-schemamigration' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-10-011-1/+13
|\ \ \ \
| * | | | bcfg2-admin: Add command to generate migrationsAlexander Sulfrian2015-09-211-1/+13
| | | | | | | | | | | | | | | | | | | | Add makemigration for django>1.7 or schemamigration for django<=1.6 with south.
* | | | | Merge branch 'master' of https://github.com/kincl/bcfg2Sol Jerome2015-10-011-0/+1
|\ \ \ \ \
| * | | | | Run the superclass shutdown() to correctly set self.startedJason Kincl2015-09-291-0/+1
| | | | | |
* | | | | | testsuite: metadata.bundles shoud be a set()Alexander Sulfrian2015-09-301-2/+2
| | | | | |
* | | | | | Bundler: Fix addition of bundle.Alexander Sulfrian2015-09-301-1/+1
|/ / / / / | | | | | | | | | | | | | | | bundles is a set and does only have add() but not append().
* | | | | Merge branch 'master' of https://github.com/gordonmessmer/bcfg2Sol Jerome2015-09-241-3/+10
|\ \ \ \ \
| * | | | | The export script will set _rc to "rc<number", and likewise forGordon Messmer2015-09-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _pre. Update the Release macro to work correctly in that case, and reset both _rc and _pre to a commented-out state.
| * | | | | Include recent changes in RPM spec dependencies.Gordon Messmer2015-09-131-2/+9
| | | | | |
* | | | | | Merge branch 'core-py' of https://github.com/gordonmessmer/bcfg2Sol Jerome2015-09-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Prevent lxml Element from being passed non-string dataGordon Messmer2015-09-131-1/+1
| |/ / / /
* | | | | Merge pull request #310 from AlexanderS/fix/loggingChris St. Pierre2015-09-211-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Logging: Fix message building
| * | | | Logging: Fix message buildingAlexander Sulfrian2015-09-211-0/+2
|/ / / / | | | | | | | | | | | | | | | | The logging.LogRecord instance could contain args to replace some placeholders in the format string in msg.
* | | | Merge pull request #306 from gordonmessmer/masterChris St. Pierre2015-09-111-1/+9
|\| | | | | | | | | | | Keep trailing newlines in Jinja2 templates.
| * | | 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
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-05-19 03:41:37 +0000