summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/django1.7' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-10-0130-2150/+2977
|\
| * Reports: Use try/except and no version comparisonAlexander Sulfrian2015-09-291-3/+2
| |
| * tools/upgrade: Fix checking for related fieldsAlexander Sulfrian2015-09-291-7/+9
| | | | | | | | | | If we check for the existance of a related object, newer django versions (>= 1.5) raise a ObjectDoesNotExist exception and we have to handle it.
| * Reporting: Add django.setup()Alexander Sulfrian2015-09-291-0/+3
| | | | | | | | | | bcfg2-reports does not call sync_databases or migrate_databases before making the database queries. So we need to initialize django here, too.
| * Reporting: Replace get_template_from_string() for django 1.8Alexander Sulfrian2015-09-231-2/+9
| | | | | | | | | | Django 1.8 introduced different template engines and droped the get_template_from_string function as it does not support the new feature.
| * DBSettings: XViewMiddleware was moved into another packageAlexander Sulfrian2015-09-231-2/+8
| | | | | | | | The old name was deprecated with django1.6 and removed with django1.8.
| * Reporting: Replace _meta.get_all_field_names() for django 1.8Alexander Sulfrian2015-09-231-1/+11
| | | | | | | | | | | | | | The _meta API was changed with django 1.8 and get_fields() now returns all model fields even fields defined in related models. But while creating the Entries we use this field list for construction and the list should only contain local fields.
| * Reports: Add explicit default valueAlexander Sulfrian2015-09-231-1/+1
| | | | | | | | | | Django changed the default value for BooleanFields some time ago, so we add an explicit default value to remove the warnings.
| * Reports: Fix InternalDatabaseVersionAlexander Sulfrian2015-09-232-14/+23
| | | | | | | | | | | | You could not import a class, that is defined in a function. We need to return the class, but we do not want to define it multiple times. So we have to save the class in a global variable.
| * DBSettings: allow_syncdb is replaced with allow_migrateAlexander Sulfrian2015-09-231-1/+8
| |
| * Reporting: Do not use django.db.backend in newer django versionsAlexander Sulfrian2015-09-232-12/+22
| | | | | | | | | | | | The private API django.db.backend is deprecated in django 1.7 and removed in django 1.8, so we use another way to get the DatabaseOperations from the connection.
| * tools/upgrade: Support multiple databasesAlexander Sulfrian2015-09-231-3/+5
| | | | | | | | | | Do not use the global django connection object but the matching instance from the django connections list.
| * tools/upgrade: Parse the Options before using djangoAlexander Sulfrian2015-09-231-2/+3
| | | | | | | | | | | | We need to go through the Options parsing before we could use django and import the models. The Options parsing will setup django and prepare the required settings.
| * Replace close_connection() for newer django versionsAlexander Sulfrian2015-09-232-4/+13
| | | | | | | | | | | | | | django.db.close_connection() is deprecated in django1.7 (and removed in 1.8). The new django.db.close_old_connections() does not seem to work like the old one (see http://stackoverflow.com/a/32614137), so we replace it with an own implementation.
| * Server: Use close_db_connection decorator everywhereAlexander Sulfrian2015-09-231-4/+1
| |
| * Server/Admin: Remove load_models() callAlexander Sulfrian2015-09-231-1/+0
| | | | | | | | | | | | The models should be loaded during the options parsing and so this call issues a warning message from django, that the models are already registered.
| * Server/Admin: Remove call of django.setupAlexander Sulfrian2015-09-231-3/+0
| | | | | | | | django.setup() is already called from the option parsing before.
| * DBSettings: syncdb is replaced by migrateAlexander Sulfrian2015-09-231-2/+4
| |
| * DBSettings: Automatically upgrade migrations from south to djangoAlexander Sulfrian2015-09-231-0/+43
| | | | | | | | | | | | | | | | | | | | | | On the first use with django-1.7 we manually get the south migration status and fake apply the django migration to that point. With that users can switch to django migrations at any point of time. The code simply takes the name of the last south migration and forwards the django migrations to that point. Therefor it is required to keep the names of the migrations in sync. It is required to keep the migration names of the two systems in sync.
| * Add matching django migrations for southAlexander Sulfrian2015-09-237-272/+411
| |
| * Reporting: Clear error message if django is missingAlexander Sulfrian2015-09-231-8/+7
| |
| * fix check for reporting in src/lib/Bcfg2/Server/Plugins/Reporting.pyJonas Jochmaring2015-09-231-7/+11
| |
| * added django.setup() calls to src/lib/Bcfg2/DBSettings.pyJonas Jochmaring2015-09-232-2/+6
| |
| * update testsuite for django 1.7Jonas Jochmaring2015-09-231-0/+4
| |
| * 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
|\ \ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-21 12:18:34 +0000