6 files changed, 45 insertions, 13 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 762d018eb..ca0fe8188 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -456,7 +456,9 @@ class DirectoryBacked(Debuggable):
             # again without having to add a new monitor.
         elif os.path.isdir(abspath):
             # Deal with events for directories
-            if action in ['exists', 'created']:
+            if os.path.exists(os.path.join(abspath, '.bcfg2-ignore')):
+                self.logger.debug("Ignoring directory %s" % abspath)
+            elif action in ['exists', 'created']:
                 self.add_directory_monitor(relpath)
             elif action == 'changed':
                 if relpath in self.entries:
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py
index f5bcbe797..4f5a79465 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bundler.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py
@@ -133,7 +133,7 @@ class Bundler(Plugin,
                     if child.get('inherit_modification', 'false') == 'true':
                         if metadata.version_info >= \
                            Bcfg2VersionInfo('1.4.0pre2'):
-                            lxml.etree.SubElement(data, 'Bundle',
+                            lxml.etree.SubElement(data, 'BoundBundle',
                                                   name=child.get('name'))
                         else:
                             self.logger.warning(
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCACertCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCACertCreator.py
index 92fcc4cd8..b9ced6682 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCACertCreator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCACertCreator.py
@@ -216,15 +216,12 @@ class CfgSSLCACertCreator(XMLCfgCreator, CfgVerifier):
         chaincert = ca.get('chaincert')
         cmd = ["openssl", "verify"]
         is_root = ca.get('root_ca', "false").lower() == 'true'
-        if is_root:
-            cmd.append("-CAfile")
-        else:
-            # verifying based on an intermediate cert
-            cmd.extend(["-purpose", "sslserver", "-untrusted"])
-        cmd.extend([chaincert, filename])
+        if not is_root:
+            cmd.append("-partial_chain")
+        cmd.extend(["-trusted", chaincert, filename])
         self.debug_log("Cfg: Verifying %s against CA" % entry.get("name"))
         result = self.cmd.run(cmd)
-        if result.stdout == cert + ": OK\n":
+        if result.stdout == filename + ": OK\n":
             self.debug_log("Cfg: %s verified successfully against CA" %
                            entry.get("name"))
         else:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Dummy.py b/src/lib/Bcfg2/Server/Plugins/Packages/Dummy.py
new file mode 100644
index 000000000..f47b8f22c
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Dummy.py
@@ -0,0 +1,35 @@
+""" Dummy backend for :mod:`Bcfg2.Server.Plugins.Packages` """
+
+from Bcfg2.Server.Plugins.Packages.Collection import Collection
+from Bcfg2.Server.Plugins.Packages.Source import Source
+
+
+class DummyCollection(Collection):
+    """ Handle collections of Dummy sources.  This is a no-op object
+    that simply inherits from
+    :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection`,
+    overrides nothing, and defers all operations to :class:`PacSource`
+    """
+
+    def __init__(self, metadata, sources, cachepath, basepath, debug=False):
+        # we define an __init__ that just calls the parent __init__,
+        # so that we can set the docstring on __init__ to something
+        # different from the parent __init__ -- namely, the parent
+        # __init__ docstring, minus everything after ``.. -----``,
+        # which we use to delineate the actual docs from the
+        # .. autoattribute hacks we have to do to get private
+        # attributes included in sphinx 1.0 """
+        Collection.__init__(self, metadata, sources, cachepath, basepath,
+                            debug=debug)
+    __init__.__doc__ = Collection.__init__.__doc__.split(".. -----")[0]
+
+
+class DummySource(Source):
+    """ Handle Dummy sources """
+
+    #: DummySource sets the ``type`` on Package entries to "dummy"
+    ptype = 'dummy'
+
+    def __init__(self, basepath, xsource):
+        xsource.set('rawurl', 'http://example.com/')
+        Source.__init__(self, basepath, xsource)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py
index 1fff3b7a7..5248ad896 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py
@@ -87,9 +87,7 @@ class PkgngSource(Source):
                 self.logger.error("Packages: Failed to read file %s" % fname)
                 raise
             for line in packagesite.readlines():
-                if not isinstance(line, str):
-                    line = line.decode('utf-8')
-                pkg = json.loads(line)
+                pkg = json.loads(unicode(line, errors='ignore'))
                 pkgname = pkg['name']
                 self.pkgnames.add(pkgname)
                 if 'deps' in pkg:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index d888af965..1a9673891 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -64,7 +64,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
             help="Packages backends to load",
             type=Bcfg2.Options.Types.comma_list,
             action=PackagesBackendAction,
-            default=['Yum', 'Apt', 'Pac', 'Pkgng', 'Pyapt']),
+            default=['Yum', 'Apt', 'Pac', 'Pkgng', 'Dummy', 'Pyapt']),
         Bcfg2.Options.PathOption(
             cf=("packages", "cache"), dest="packages_cache",
             help="Path to the Packages cache",