diff options
| author | Jonas Jochmaring <jjonas@mail.upb.de> | 2015-05-22 15:29:02 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-09-23 19:28:57 +0200 |
| commit | fe2e0a3ddbe05e5eace11268ddf909ed386438d0 (patch) | |
| tree | 2029a7903813eedff19bc232a3ec92246a64452a /src/lib/Bcfg2/DBSettings.py | |
| parent | 5b0a2d1ba24a210a66a91cc1755f4e24fd8a9b7f (diff) | |
| download | bcfg2-fe2e0a3ddbe05e5eace11268ddf909ed386438d0.tar.gz bcfg2-fe2e0a3ddbe05e5eace11268ddf909ed386438d0.tar.bz2 bcfg2-fe2e0a3ddbe05e5eace11268ddf909ed386438d0.zip | |
make Bcfg2-web compatible with django 1.7
- reports.wsgi uses get_wsgi_application() now
- old south-based migrations have been moved
- manage.py has been updated
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 420f0ddd8..bff24ffce 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -67,8 +67,13 @@ settings = dict( # pylint: disable=C0103 'django.core.context_processors.request'), DATABASE_ROUTERS=['Bcfg2.DBSettings.PerApplicationRouter']) -if HAS_SOUTH: +if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7: + settings['INSTALLED_APPS'] += ('Bcfg2.Reporting',) +elif HAS_SOUTH: settings['INSTALLED_APPS'] += ('south', 'Bcfg2.Reporting') + settings['SOUTH_MIGRATION_MODULES'] = { + 'Bcfg2.Reporting': 'Bcfg2.Reporting.south_migrations' + } if 'BCFG2_LEGACY_MODELS' in os.environ: settings['INSTALLED_APPS'] += ('Bcfg2.Server.Reports.reports',) |