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

1 files changed, 0 insertions, 47 deletions

diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
deleted file mode 100644
index bd379b98d..000000000
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import sys
-from django import template
-from django.utils.encoding import smart_unicode
-from django.utils.html import conditional_escape
-from django.utils.safestring import mark_safe
-
-from Bcfg2.Compat import u_str
-
-register = template.Library()
-
-# pylint: disable=E0611
-try:
-    from pygments import highlight
-    from pygments.lexers import get_lexer_by_name
-    from pygments.formatters import HtmlFormatter
-    colorize = True
-except:
-    colorize = False
-# pylint: enable=E0611
-
-
-@register.filter
-def syntaxhilight(value, arg="diff", autoescape=None):
-    """
-    Returns a syntax-hilighted version of Code;
-    requires code/language arguments
-    """
-
-    if autoescape:
-        value = conditional_escape(value)
-        arg = conditional_escape(arg)
-
-    if colorize:
-        try:
-            output = u_str('<style  type="text/css">') \
-                + smart_unicode(HtmlFormatter().get_style_defs('.highlight')) \
-                + u_str('</style>')
-
-            lexer = get_lexer_by_name(arg)
-            output += highlight(value, lexer, HtmlFormatter())
-            return mark_safe(output)
-        except:
-            return value
-    else:
-        return mark_safe(u_str('<div class="note-box">Tip: Install pygments '
-                               'for highlighting</div><pre>%s</pre>') % value)
-syntaxhilight.needs_autoescape = True