Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt

12 files changed, 66 insertions, 44 deletions

diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index a668a0870..5a9581e9a 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -221,7 +221,15 @@ class Frame(object):
 
         # take care of important entries first
         if not self.dryrun:
-            for parent in self.config.findall(".//Path/.."):
+            parent_map = dict((c, p)
+                              for p in self.config.getiterator()
+                              for c in p)
+            for cfile in self.config.findall(".//Path"):
+                if (cfile.get('name') not in self.__important__ or
+                    cfile.get('type') != 'file' or
+                    cfile not in self.whitelist):
+                    continue
+                parent = parent_map[cfile]
                 if ((parent.tag == "Bundle" and
                      ((self.setup['bundle'] and
                        parent.get("name") not in self.setup['bundle']) or
@@ -230,15 +238,9 @@ class Frame(object):
                     (parent.tag == "Independent" and
                      (self.setup['bundle'] or self.setup['skipindep']))):
                     continue
-                for cfile in parent.findall("./Path"):
-                    if (cfile.get('name') not in self.__important__ or
-                        cfile.get('type') != 'file' or
-                        cfile not in self.whitelist):
-                        continue
-                    tools = [t for t in self.tools
-                             if t.handlesEntry(cfile) and t.canVerify(cfile)]
-                    if not tools:
-                        continue
+                tools = [t for t in self.tools
+                         if t.handlesEntry(cfile) and t.canVerify(cfile)]
+                if tools:
                     if (self.setup['interactive'] and not
                         self.promptFilter("Install %s: %s? (y/N):", [cfile])):
                         self.whitelist.remove(cfile)
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
index 156f76159..edcc86b85 100644
--- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py
+++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
@@ -85,16 +85,16 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
         """Install Service entry."""
         self.cmd.run("/sbin/chkconfig --add %s" % (entry.get('name')))
         self.logger.info("Installing Service %s" % (entry.get('name')))
-        bootstatus = entry.get('bootstatus')
+        bootstatus = self.get_bootstatus(entry)
         if bootstatus is not None:
             if bootstatus == 'on':
                 # make sure service is enabled on boot
                 bootcmd = '/sbin/chkconfig %s %s --level 0123456' % \
-                          (entry.get('name'), entry.get('bootstatus'))
+                          (entry.get('name'), bootstatus)
             elif bootstatus == 'off':
                 # make sure service is disabled on boot
                 bootcmd = '/sbin/chkconfig %s %s' % (entry.get('name'),
-                                                     entry.get('bootstatus'))
+                                                     bootstatus)
             bootcmdrv = self.cmd.run(bootcmd).success
             if self.setup['servicemode'] == 'disabled':
                 # 'disabled' means we don't attempt to modify running svcs
@@ -116,8 +116,8 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
     def FindExtra(self):
         """Locate extra chkconfig Services."""
         allsrv = [line.split()[0]
-                  for line in self.cmd.run("/sbin/chkconfig",
-                                           "--list").stdout.splitlines()
+                  for line in
+                  self.cmd.run("/sbin/chkconfig --list").stdout.splitlines()
                   if ":on" in line]
         self.logger.debug('Found active services:')
         self.logger.debug(allsrv)
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index 16fe0acb5..3778569a6 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -706,16 +706,10 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
                               (path, err))
             rv = False
 
-        # we need to make sure that we give +x to everyone who needs
-        # it.  E.g., if the file that's been distributed is 0600, we
-        # can't make the parent directories 0600 also; that'd be
-        # pretty useless.  They need to be 0700.
+        # set auto-created directories to mode 755, if you need
+        # something else, you should specify it in your config
         tmpentry = copy.deepcopy(entry)
-        newmode = int(entry.get('mode'), 8)
-        for i in range(0, 3):
-            if newmode & (6 * pow(8, i)):
-                newmode |= 1 * pow(8, i)
-        tmpentry.set('mode', oct_mode(newmode))
+        tmpentry.set('mode', '0755')
         for acl in tmpentry.findall('ACL'):
             acl.set('perms',
                     oct_mode(self._norm_acl_perms(acl.get('perms')) |
diff --git a/src/lib/Bcfg2/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
index 8e9626521..e0c913dcd 100644
--- a/src/lib/Bcfg2/Client/Tools/RcUpdate.py
+++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
@@ -89,7 +89,7 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
     def InstallService(self, entry):
         """Install Service entry."""
         self.logger.info('Installing Service %s' % entry.get('name'))
-        bootstatus = entry.get('bootstatus')
+        bootstatus = self.get_bootstatus(entry)
         if bootstatus is not None:
             if bootstatus == 'on':
                 # make sure service is enabled on boot
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 64408693a..a1fd07b86 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -319,6 +319,28 @@ def colon_split(c_string):
     return []
 
 
+def dict_split(c_string):
+    """ split an option string on commas, optionally surrounded by
+    whitespace and split the resulting items again on equals signs,
+    returning a dict """
+    result = dict()
+    if c_string:
+        items = re.split(r'\s*,\s*', c_string)
+        for item in items:
+            if r'=' in item:
+                key, value = item.split(r'=', 1)
+                try:
+                    result[key] = get_bool(value)
+                except ValueError:
+                    try:
+                        result[key] = get_int(value)
+                    except ValueError:
+                        result[key] = value
+            else:
+                result[item] = True
+    return result
+
+
 def get_bool(val):
     """ given a string value of a boolean configuration option, return
     an actual bool (True or False) """
@@ -646,6 +668,12 @@ DB_PORT = \
            default='',
            cf=('database', 'port'))
 
+DB_OPTIONS = \
+    Option('Database options',
+           default=dict(),
+           cf=('database', 'options'),
+           cook=dict_split)
+
 # Django options
 WEB_CFILE = \
     Option('Web interface configuration file',
@@ -1217,6 +1245,7 @@ DATABASE_COMMON_OPTIONS = dict(web_configfile=WEB_CFILE,
                                db_password=DB_PASSWORD,
                                db_host=DB_HOST,
                                db_port=DB_PORT,
+                               db_options=DB_OPTIONS,
                                time_zone=DJANGO_TIME_ZONE,
                                django_debug=DJANGO_DEBUG,
                                web_prefix=DJANGO_WEB_PREFIX)
diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html
index 7f1fcba3b..0b2b7dd36 100644
--- a/src/lib/Bcfg2/Reporting/templates/base.html
+++ b/src/lib/Bcfg2/Reporting/templates/base.html
@@ -93,7 +93,7 @@ This is needed for Django versions less than 1.5
   <div style='clear:both'></div>
 </div><!-- document -->
   <div id="footer">
-    <span>Bcfg2 Version 1.3.1</span>
+    <span>Bcfg2 Version 1.3.2</span>
     </div>
 
 <div id="calendar_div" style='position:absolute; visibility:hidden; background-color:white; layer-background-color:white;'></div>
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index a9b622637..9fb0b07cc 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -749,7 +749,7 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
             return self._remove_xdata(self.groups_xml, "Bundle", bundle_name)
 
     def remove_client(self, client_name):
-        """Remove a bundle."""
+        """Remove a client."""
         if self._use_db:
             try:
                 client = MetadataClientModel.objects.get(hostname=client_name)
@@ -1055,7 +1055,8 @@ class Metadata(Bcfg2.Server.Plugin.Metadata,
                 raise Bcfg2.Server.Plugin.MetadataConsistencyError(err)
             return self.addresses[address][0]
         try:
-            cname = socket.gethostbyaddr(address)[0].lower()
+            cname = socket.getnameinfo(addresspair,
+                                       socket.NI_NAMEREQD)[0].lower()
             if cname in self.aliases:
                 return self.aliases[cname]
             return cname
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 8c272cf53..8e14b0dfb 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -495,7 +495,8 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         if len(sclasses) > 1:
             self.logger.warning("Packages: Multiple source types found for "
                                 "%s: %s" %
-                                ",".join([s.__name__ for s in sclasses]))
+                                (metadata.hostname,
+                                 ",".join([s.__name__ for s in sclasses])))
             cclass = Collection
         elif len(sclasses) == 0:
             self.logger.error("Packages: No sources found for %s" %
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 6827c3d1f..c6cf920df 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -251,7 +251,7 @@ class Probes(Bcfg2.Server.Plugin.Probing,
 
         ProbesDataModel.objects.filter(
             hostname=client.hostname).exclude(
-                probe__in=self.probedata[client.hostname]).delete()
+            probe__in=self.probedata[client.hostname]).delete()
 
         for group in self.cgroups[client.hostname]:
             try:
@@ -266,7 +266,7 @@ class Probes(Bcfg2.Server.Plugin.Probing,
                     group=group)
         ProbesGroupsModel.objects.filter(
             hostname=client.hostname).exclude(
-                group__in=self.cgroups[client.hostname]).delete()
+            group__in=self.cgroups[client.hostname]).delete()
 
     def load_data(self):
         """ Load probe data from the appropriate backend (probed.xml
diff --git a/src/lib/Bcfg2/Utils.py b/src/lib/Bcfg2/Utils.py
index d087f4f87..e51ecb464 100644
--- a/src/lib/Bcfg2/Utils.py
+++ b/src/lib/Bcfg2/Utils.py
@@ -215,7 +215,9 @@ class Executor(object):
         """
         if isinstance(command, str):
             cmdstr = command
-            command = shlex.split(cmdstr)
+
+            if not shell:
+                command = shlex.split(cmdstr)
         else:
             cmdstr = " ".join(command)
         self.logger.debug("Running: %s" % cmdstr)
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py
index c06074845..d73ab7c56 100644
--- a/src/lib/Bcfg2/settings.py
+++ b/src/lib/Bcfg2/settings.py
@@ -19,14 +19,6 @@ except ImportError:
 
 DATABASES = dict()
 
-# Django < 1.2 compat
-DATABASE_ENGINE = None
-DATABASE_NAME = None
-DATABASE_USER = None
-DATABASE_PASSWORD = None
-DATABASE_HOST = None
-DATABASE_PORT = None
-
 TIME_ZONE = None
 
 DEBUG = False
@@ -58,8 +50,8 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None):
     """ read the config file and set django settings based on it """
     # pylint: disable=W0602,W0603
     global DATABASE_ENGINE, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, \
-        DATABASE_HOST, DATABASE_PORT, DEBUG, TEMPLATE_DEBUG, TIME_ZONE, \
-        MEDIA_URL
+        DATABASE_HOST, DATABASE_PORT, DATABASE_OPTIONS, DEBUG, \
+        TEMPLATE_DEBUG, TIME_ZONE, MEDIA_URL
     # pylint: enable=W0602,W0603
 
     if not os.path.exists(cfile) and os.path.exists(DEFAULT_CONFIG):
@@ -86,7 +78,8 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None):
              USER=setup['db_user'],
              PASSWORD=setup['db_password'],
              HOST=setup['db_host'],
-             PORT=setup['db_port'])
+             PORT=setup['db_port'],
+             OPTIONS=setup['db_options'])
 
     # dropping the version check.  This was added in 1.1.2
     TIME_ZONE = setup['time_zone']
diff --git a/src/lib/Bcfg2/version.py b/src/lib/Bcfg2/version.py
index 12fc584fe..140fb6937 100644
--- a/src/lib/Bcfg2/version.py
+++ b/src/lib/Bcfg2/version.py
@@ -2,7 +2,7 @@
 
 import re
 
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 
 
 class Bcfg2VersionInfo(tuple):  # pylint: disable=E0012,R0924