From 44638176067df5231bf0be30801e36863391cd1f Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Mon, 8 Oct 2012 10:38:02 -0500
Subject: Reporting: Merge new reporting data

Move reporting data to a new schema
Use south for django migrations
Add bcfg2-report-collector daemon

Conflicts:
	doc/development/index.txt
	doc/server/plugins/connectors/properties.txt
	doc/server/plugins/generators/packages.txt
	setup.py
	src/lib/Bcfg2/Client/Tools/SELinux.py
	src/lib/Bcfg2/Compat.py
	src/lib/Bcfg2/Encryption.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Reports.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Inotify.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/interfaces.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Ohai.py
	src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Reports/backends.py
	src/lib/Bcfg2/Server/Reports/manage.py
	src/lib/Bcfg2/Server/Reports/nisauth.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-yum-helper
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py
---
 src/lib/Bcfg2/settings.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'src/lib/Bcfg2/settings.py')

diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index cfb515136..395bb97d6 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -10,6 +10,13 @@ try:
 except ImportError:
     HAS_DJANGO = False
 
+# required for reporting
+try:
+    import south
+    has_south = True
+except:
+    has_south = False
+
 DATABASES = dict()
 
 # Django < 1.2 compat
@@ -91,6 +98,7 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False):
     TIME_ZONE = setup['time_zone']
 
     DEBUG = setup['django_debug']
+    DEBUG = True
     TEMPLATE_DEBUG = DEBUG
     if DEBUG:
         print("Warning: Setting web_debug to True causes extraordinary memory "
@@ -101,6 +109,14 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False):
     else:
         MEDIA_URL = '/site_media'
 
+    if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 3:
+        CACHE_BACKEND = 'locmem:///'
+    else:
+        CACHES = {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            }
+        }
 
 # initialize settings from /etc/bcfg2-web.conf or /etc/bcfg2.conf, or
 # set up basic defaults.  this lets manage.py work in all cases
@@ -123,9 +139,13 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
-    'Bcfg2.Server.Reports.reports',
-    'Bcfg2.Server'
+    'Bcfg2.Server',
 )
+if has_south:
+    INSTALLED_APPS = INSTALLED_APPS + (
+        'south',
+        'Bcfg2.Reporting',
+    )
 
 # Imported from Bcfg2.Server.Reports
 MEDIA_ROOT = ''
@@ -158,7 +178,7 @@ MIDDLEWARE_CLASSES = (
 )
 
 # TODO - move this to a higher root and dynamically import
-ROOT_URLCONF = 'Bcfg2.Server.Reports.urls'
+ROOT_URLCONF = 'Bcfg2.Reporting.urls'
 
 # TODO - this isn't usable
 # Authentication Settings
-- 
cgit v1.2.3-1-g7c22