Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | some more django 1.7 compatibility fixes | Jonas Jochmaring | 2015-09-23 | 3 | -14/+19 | |
| | | | | ||||||
| * | | | make Bcfg2-web compatible with django 1.7 | Jonas Jochmaring | 2015-09-23 | 13 | -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/bcfg2 | Sol Jerome | 2015-10-01 | 1 | -1/+13 | |
|\ \ \ \ | ||||||
| * | | | | bcfg2-admin: Add command to generate migrations | Alexander Sulfrian | 2015-09-21 | 1 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | Add makemigration for django>1.7 or schemamigration for django<=1.6 with south. | |||||
* | | | | | Merge branch 'master' of https://github.com/kincl/bcfg2 | Sol Jerome | 2015-10-01 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Run the superclass shutdown() to correctly set self.started | Jason Kincl | 2015-09-29 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | testsuite: metadata.bundles shoud be a set() | Alexander Sulfrian | 2015-09-30 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Bundler: Fix addition of bundle. | Alexander Sulfrian | 2015-09-30 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | bundles is a set and does only have add() but not append(). | |||||
* | | | | | Merge branch 'master' of https://github.com/gordonmessmer/bcfg2 | Sol Jerome | 2015-09-24 | 1 | -3/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | The export script will set _rc to "rc<number", and likewise for | Gordon Messmer | 2015-09-14 | 1 | -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 Messmer | 2015-09-13 | 1 | -2/+9 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'core-py' of https://github.com/gordonmessmer/bcfg2 | Sol Jerome | 2015-09-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Prevent lxml Element from being passed non-string data | Gordon Messmer | 2015-09-13 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #310 from AlexanderS/fix/logging | Chris St. Pierre | 2015-09-21 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Logging: Fix message building | |||||
| * | | | | Logging: Fix message building | Alexander Sulfrian | 2015-09-21 | 1 | -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/master | Chris St. Pierre | 2015-09-11 | 1 | -1/+9 | |
|\| | | | | | | | | | | | Keep trailing newlines in Jinja2 templates. | |||||
| * | | | Compatibility with Jinja < 2.7. | Gordon Messmer | 2015-09-09 | 1 | -3/+9 | |
| | | | | ||||||
| * | | | Keep trailing newlines in Jinja2 templates. | Gordon Messmer | 2015-09-09 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge branch 'no-django' of https://github.com/AlexanderS/bcfg2 | Sol Jerome | 2015-09-01 | 1 | -2/+4 | |
|\ \ \ | ||||||
| * | | | DBSettings: Don't use django, if it's not available | Alexander Sulfrian | 2015-07-20 | 1 | -2/+4 | |
| | | | | ||||||
* | | | | Merge branch 'rules-replace_name' of https://github.com/AlexanderS/bcfg2 | Sol Jerome | 2015-09-01 | 9 | -11/+116 | |
|\ \ \ \ | ||||||
| * | | | | testsuite: Fix debug messages to handle xml with a '%' inside | Alexander Sulfrian | 2015-08-26 | 1 | -9/+10 | |
| | | | | | ||||||
| * | | | | Rules: New options replace_name to replace %{name} in attributes | Alexander Sulfrian | 2015-08-26 | 8 | -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/master | Chris St. Pierre | 2015-09-01 | 1 | -3/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | doc: update Genshi 'name' attribute description | |||||
| * | | | | | doc: update Genshi 'name' attribute description | s19n | 2015-08-07 | 1 | -3/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'no-jinja2' of https://github.com/AlexanderS/bcfg2 | Sol Jerome | 2015-07-28 | 1 | -14/+15 | |
|\ \ \ \ \ | ||||||
| * | | | | | Plugins/Cfg: Don't depend on jinja2 | Alexander Sulfrian | 2015-07-20 | 1 | -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-default | Chris St. Pierre | 2015-07-28 | 3 | -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 components | Alexander Sulfrian | 2015-07-22 | 2 | -2/+11 | |
| | | | | | | ||||||
| * | | | | | Options: Set default values from config, right after adding a new option | Alexander Sulfrian | 2015-07-22 | 1 | -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-daemon | Chris St. Pierre | 2015-07-28 | 1 | -1/+20 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | BuiltinCore: Fix logging with daemonization | |||||
| * | | | | | | BuiltinCore: Fix logging with daemonization | Alexander Sulfrian | 2015-07-28 | 1 | -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/bcfg2 | Sol Jerome | 2015-07-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Client/Tools/Systemd: Do not stop services if status is set to ignore | Alexander Sulfrian | 2015-07-27 | 1 | -1/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Ldap: Run full code style checks agains the plugin | Alexander Sulfrian | 2015-07-24 | 1 | -1/+0 | |
| | | | | | | ||||||
* | | | | | | Ldap: Complete renew of the Ldap plugin | Alexander Sulfrian | 2015-07-24 | 5 | -255/+267 | |
| | | | | | | ||||||
* | | | | | | Utils: Generalize safe_module_name | Alexander Sulfrian | 2015-07-24 | 4 | -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/bcfg2 | Sol Jerome | 2015-07-23 | 13 | -40/+54 | |
|\ \ \ \ \ | ||||||
| * | | | | | testsuite/common: Add the new option. | Alexander Sulfrian | 2015-07-23 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | DBSettings: Add possibility to specify arbitrary django options. | Alexander Sulfrian | 2015-07-23 | 3 | -1/+18 | |
| | | | | | | ||||||
| * | | | | | Reporting/templates: Use configurable date formats. | Alexander Sulfrian | 2015-07-23 | 6 | -6/+12 | |
| | | | | | | ||||||
| * | | | | | Options/Types: Fix database OPTIONS parsing | Alexander Sulfrian | 2015-07-23 | 4 | -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/bcfg2 | Sol Jerome | 2015-07-22 | 5 | -39/+43 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | tests: is_string is now in Bcfg2.Utils | Alexander Sulfrian | 2015-07-22 | 2 | -22/+21 | |
| | | | | | ||||||
| * | | | | Utils: Generalize is_string from POSIX/File | Alexander Sulfrian | 2015-07-22 | 3 | -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 files | Alexander Sulfrian | 2015-07-21 | 1 | -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/bcfg2 | Sol Jerome | 2015-07-21 | 1 | -1/+2 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | PrioDir: Only set text content, if something is available | Alexander Sulfrian | 2015-07-21 | 1 | -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-tools | Chris St. Pierre | 2015-07-21 | 2 | -7/+11 | |
|\ \ \ | |/ / |/| | | Fix some issues with new Options parser in tools/ | |||||
| * | | tools: components of a Options parser sould be a list | Alexander Sulfrian | 2015-07-20 | 1 | -1/+1 | |
| | | |