3 files changed, 78 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedJinja2Generator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedJinja2Generator.py
new file mode 100644
index 000000000..c8da84ae0
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedJinja2Generator.py
@@ -0,0 +1,25 @@
+""" Handle encrypted Jinja2 templates (.crypt.jinja2 or
+.jinja2.crypt files)"""
+
+from Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator import CfgJinja2Generator
+from Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator \
+    import CfgEncryptedGenerator
+
+
+class CfgEncryptedJinja2Generator(CfgJinja2Generator, CfgEncryptedGenerator):
+    """ CfgEncryptedJinja2Generator lets you encrypt your Jinja2
+    :ref:`server-plugins-generators-cfg` files on the server """
+
+    #: handle .crypt.jinja2 or .jinja2.crypt files
+    __extensions__ = ['jinja2.crypt', 'crypt.jinja2']
+
+    #: Override low priority from parent class
+    __priority__ = 0
+
+    def handle_event(self, event):
+        CfgEncryptedGenerator.handle_event(self, event)
+    handle_event.__doc__ = CfgEncryptedGenerator.handle_event.__doc__
+
+    def get_data(self, entry, metadata):
+        return CfgJinja2Generator.get_data(self, entry, metadata)
+    get_data.__doc__ = CfgJinja2Generator.get_data.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py
new file mode 100644
index 000000000..e36ee78aa
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py
@@ -0,0 +1,52 @@
+""" The CfgJinja2Generator allows you to use the `Jinja2
+<http://jinja.pocoo.org/>`_ templating system to generate
+:ref:`server-plugins-generators-cfg` files. """
+
+import Bcfg2.Options
+from Bcfg2.Server.Plugin import PluginExecutionError, \
+    DefaultTemplateDataProvider, get_template_data
+from Bcfg2.Server.Plugins.Cfg import CfgGenerator
+
+try:
+    from jinja2 import Template
+    HAS_JINJA2 = True
+except ImportError:
+    HAS_JINJA2 = False
+
+
+class DefaultJinja2DataProvider(DefaultTemplateDataProvider):
+    """ Template data provider for Jinja2 templates. Jinja2 and
+    Genshi currently differ over the value of the ``path`` variable,
+    which is why this is necessary. """
+
+    def get_template_data(self, entry, metadata, template):
+        rv = DefaultTemplateDataProvider.get_template_data(self, entry,
+                                                           metadata, template)
+        rv['path'] = rv['name']
+        return rv
+
+
+class CfgJinja2Generator(CfgGenerator):
+    """ The CfgJinja2Generator allows you to use the `Jinja2
+    <http://jinja.pocoo.org/>`_ templating system to generate
+    :ref:`server-plugins-generators-cfg` files. """
+
+    #: Handle .jinja2 files
+    __extensions__ = ['jinja2']
+
+    #: Low priority to avoid matching host- or group-specific
+    #: .crypt.jinja2 files
+    __priority__ = 50
+
+    def __init__(self, fname, spec):
+        CfgGenerator.__init__(self, fname, spec)
+        if not HAS_JINJA2:
+            raise PluginExecutionError("Jinja2 is not available")
+    __init__.__doc__ = CfgGenerator.__init__.__doc__
+
+    def get_data(self, entry, metadata):
+        template = Template(self.data.decode(Bcfg2.Options.setup.encoding))
+        return template.render(
+            get_template_data(entry, metadata, self.name,
+                              default=DefaultJinja2DataProvider()))
+    get_data.__doc__ = CfgGenerator.get_data.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Decisions.py b/src/lib/Bcfg2/Server/Plugins/Decisions.py
index 3d3ef8f8c..b30a9acea 100644
--- a/src/lib/Bcfg2/Server/Plugins/Decisions.py
+++ b/src/lib/Bcfg2/Server/Plugins/Decisions.py
@@ -31,4 +31,4 @@ class Decisions(Bcfg2.Server.Plugin.Plugin,
         self.blacklist = DecisionFile(os.path.join(self.data, "blacklist.xml"))
 
     def GetDecisions(self, metadata, mode):
-        return getattr(self, mode).get_decision(metadata)
+        return getattr(self, mode).get_decisions(metadata)