Merge lp:~james-page/ubuntu/natty/cobbler/fix-764391 into lp:ubuntu/natty/cobbler

[James Page]

Fix up management of bind9 on Ubuntu as paths/daemon names where Redhat-esq.

[Dave Walker (davewalker)]

lgtm, uploaded to natty queue.

Thanks.

[Dave Walker (davewalker)]

review: Approve

=== added directory '.pc/40_ubuntu_bind9_management.patch'
=== added directory '.pc/40_ubuntu_bind9_management.patch/cobbler'
=== added file '.pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py'
--- .pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py	1970-01-01 00:00:00 +0000
+++ .pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py	2011-04-18 12:44:31 +0000
@@ -0,0 +1,482 @@
+"""
+Validates whether the system is reasonably well configured for
+serving up content.  This is the code behind 'cobbler check'.
+
+Copyright 2006-2009, Red Hat, Inc
+Michael DeHaan <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301  USA
+"""
+
+import os
+import re
+import action_sync
+import utils
+import glob
+from utils import _
+import clogger
+
+class BootCheck:
+
+   def __init__(self,config,logger=None):
+       """
+       Constructor
+       """
+       self.config   = config
+       self.settings = config.settings()
+       if logger is None:
+           logger       = clogger.Logger()
+       self.logger      = logger
+
+
+   def run(self):
+       """
+       Returns None if there are no errors, otherwise returns a list
+       of things to correct prior to running application 'for real'.
+       (The CLI usage is "cobbler check" before "cobbler sync")
+       """
+       status = []
+       self.checked_dist = utils.check_dist()
+       self.check_name(status)
+       self.check_selinux(status)
+       if self.settings.manage_dhcp:
+           mode = self.config.api.get_sync().dhcp.what()
+           if mode == "isc": 
+               self.check_dhcpd_bin(status)
+               self.check_dhcpd_conf(status)
+               self.check_service(status,"dhcpd")
+           elif mode == "dnsmasq":
+               self.check_dnsmasq_bin(status)
+               self.check_service(status,"dnsmasq")
+
+       if self.settings.manage_dns:
+           mode = self.config.api.get_sync().dns.what()
+           if mode == "bind":
+               self.check_bind_bin(status)
+               self.check_service(status,"named")
+           elif mode == "dnsmasq" and not self.settings.manage_dhcp:
+               self.check_dnsmasq_bin(status)
+               self.check_service(status,"dnsmasq")
+
+       mode = self.config.api.get_sync().tftpd.what()
+       if mode == "in_tftpd": 
+           self.check_tftpd_bin(status)
+           self.check_tftpd_dir(status)
+           self.check_tftpd_conf(status)
+       elif mode == "tftpd_py":
+           self.check_ctftpd_bin(status)
+           self.check_ctftpd_dir(status)
+           self.check_ctftpd_conf(status)
+
+       self.check_service(status, "cobblerd")
+    
+       self.check_bootloaders(status)
+       self.check_rsync_conf(status)
+       self.check_httpd(status)
+       self.check_iptables(status)
+       self.check_yum(status)
+       self.check_debmirror(status)
+       self.check_for_ksvalidator(status)
+       self.check_for_default_password(status)
+       self.check_for_unreferenced_repos(status)
+       self.check_for_unsynced_repos(status)
+       self.check_for_cman(status)
+
+       return status
+
+   def check_for_ksvalidator(self, status):
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if not os.path.exists("/usr/bin/ksvalidator"):
+           status.append("ksvalidator was not found, install pykickstart")
+
+       return True
+
+   def check_for_cman(self, status):
+       # not doing rpm -q here to be cross-distro friendly
+       if not os.path.exists("/sbin/fence_ilo") and not os.path.exists("/usr/sbin/fence_ilo"):
+           status.append("fencing tools were not found, and are required to use the (optional) power management features. install cman or fence-agents to use them")
+       return True
+
+   def check_service(self, status, which, notes=""):
+       if notes != "":
+           notes = " (NOTE: %s)" % notes
+       rc = 0
+       if self.checked_dist == "redhat" or self.checked_dist == "suse":
+           if os.path.exists("/etc/rc.d/init.d/%s" % which):
+               rc = utils.subprocess_call(self.logger,"/sbin/service %s status > /dev/null 2>/dev/null" % which, shell=True)
+           if rc != 0:
+               status.append(_("service %s is not running%s") % (which,notes))
+               return False
+       elif self.checked_dist in ["debian", "ubuntu"]:
+           # we still use /etc/init.d
+           if os.path.exists("/etc/init.d/%s" % which):
+               rc = utils.subprocess_call(self.logger,"/etc/init.d/%s status /dev/null 2>/dev/null" % which, shell=True)
+           if rc != 0:
+               status.append(_("service %s is not running%s") % which,notes)
+               return False
+       elif self.checked_dist == "ubuntu":
+           if os.path.exists("/etc/init/%s.conf" % which):
+               rc = utils.subprocess_call(self.logger,"status %s > /dev/null 2>&1" % which, shell=True)
+           if rc != 0:
+               status.append(_("service %s is not running%s") % (which,notes))
+       else:
+           status.append(_("Unknown distribution type, cannot check for running service %s" % which))
+           return False
+       return True
+
+   def check_iptables(self, status):
+       if os.path.exists("/etc/rc.d/init.d/iptables"):
+           rc = utils.subprocess_call(self.logger,"/sbin/service iptables status >/dev/null 2>/dev/null", shell=True)
+           if rc == 0:
+              status.append(_("since iptables may be running, ensure 69, 80, and %(xmlrpc)s are unblocked") % { "xmlrpc" : self.settings.xmlrpc_port })
+
+   def check_yum(self,status):
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if not os.path.exists("/usr/bin/createrepo"):
+           status.append(_("createrepo package is not installed, needed for cobbler import and cobbler reposync, install createrepo?"))
+       if not os.path.exists("/usr/bin/reposync"):
+           status.append(_("reposync is not installed, need for cobbler reposync, install/upgrade yum-utils?"))
+       if not os.path.exists("/usr/bin/yumdownloader"):
+           status.append(_("yumdownloader is not installed, needed for cobbler repo add with --rpm-list parameter, install/upgrade yum-utils?"))
+       if self.settings.reposync_flags.find("-l"):
+           if self.checked_dist == "redhat" or self.checked_dist == "suse":
+               yum_utils_ver = utils.subprocess_get(self.logger,"/usr/bin/rpmquery --queryformat=%{VERSION} yum-utils", shell=True)
+               if yum_utils_ver < "1.1.17":
+                   status.append(_("yum-utils need to be at least version 1.1.17 for reposync -l, current version is %s") % yum_utils_ver )
+
+   def check_debmirror(self,status):
+       if not os.path.exists("/usr/bin/debmirror"):
+           status.append(_("debmirror package is not installed, it will be required to manage debian deployments and repositories"))
+       if os.path.exists("/etc/debmirror.conf"):
+          f = open("/etc/debmirror.conf")
+          re_dists = re.compile(r'@dists=')
+          re_arches = re.compile(r'@arches=')
+          for line in f.readlines():
+             if re_dists.search(line) and not line.strip().startswith("#"):
+                 status.append(_("comment 'dists' on /etc/debmirror.conf for proper debian support"))
+             if re_arches.search(line) and not line.strip().startswith("#"):
+                 status.append(_("comment 'arches' on /etc/debmirror.conf for proper debian support"))
+       
+
+   def check_name(self,status):
+       """
+       If the server name in the config file is still set to localhost
+       kickstarts run from koan will not have proper kernel line
+       parameters.
+       """
+       if self.settings.server == "127.0.0.1":
+          status.append(_("The 'server' field in /etc/cobbler/settings must be set to something other than localhost, or kickstarting features will not work.  This should be a resolvable hostname or IP for the boot server as reachable by all machines that will use it."))
+       if self.settings.next_server == "127.0.0.1":
+          status.append(_("For PXE to be functional, the 'next_server' field in /etc/cobbler/settings must be set to something other than 127.0.0.1, and should match the IP of the boot server on the PXE network."))
+
+   def check_selinux(self,status):
+       """
+       Suggests various SELinux rules changes to run Cobbler happily with
+       SELinux in enforcing mode.  FIXME: this method could use some
+       refactoring in the future.
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       enabled = self.config.api.is_selinux_enabled()
+       if enabled:
+           data2 = utils.subprocess_get(self.logger,"/usr/sbin/getsebool -a",shell=True)
+           for line in data2.split("\n"):
+              if line.find("httpd_can_network_connect ") != -1:
+                  if line.find("off") != -1:
+                      status.append(_("Must enable a selinux boolean to enable vital web services components, run: setsebool -P httpd_can_network_connect true"))
+              if line.find("rsync_disable_trans ") != -1:
+                  if line.find("on") != -1:
+                      status.append(_("Must enable the cobbler import and replicate commands, run: setsebool -P rsync_disable_trans=1"))
+
+           data3 = utils.subprocess_get(self.logger,"/usr/sbin/semanage fcontext -l | grep public_content_t",shell=True)
+
+           rule1 = False
+           rule2 = False
+           rule3 = False
+           selinux_msg = "/usr/sbin/semanage fcontext -a -t public_content_t \"%s\""
+           for line in data3.split("\n"):
+               if line.startswith("/tftpboot/.*"):
+                   rule1 = True
+               if line.startswith("/var/lib/tftpboot/.*"):
+                   rule2 = True
+               if line.startswith("/var/www/cobbler/images/.*"):
+                   rule3 = True
+
+           rules = []
+           if os.path.exists("/tftpboot") and not rule1:
+               rules.append(selinux_msg % "/tftpboot/.*")
+           else:
+               if not rule2:
+                   rules.append(selinux_msg % "/var/lib/tftpboot/.*")
+           if not rule3:
+               rules.append(selinux_msg % "/var/www/cobbler/images/.*")
+           if len(rules) > 0:
+               status.append("you need to set some SELinux content rules to ensure cobbler serves content correctly in your SELinux environment, run the following: %s" % " && ".join(rules))
+
+           # now check to see that the Django sessions path is accessible
+           # by Apache
+           
+           data4 = utils.subprocess_get(self.logger,"/usr/sbin/semanage fcontext -l | grep httpd_sys_content_rw_t",shell=True)
+           selinux_msg = "you need to set some SELinux rules if you want to use cobbler-web (an optional package), run the following: /usr/sbin/semanage fcontext -a -t httpd_sys_content_rw_t \"%s\""
+           rule4 = False
+           for line in data4.split("\n"):
+               if line.startswith("/var/lib/cobbler/webui_sessions/.*"):
+                   rule4 = True
+           if not rule4:
+               status.append(selinux_msg % "/var/lib/cobbler/webui_sessions/.*")
+
+
+   def check_for_default_password(self,status):
+       default_pass = self.settings.default_password_crypted
+       if default_pass == "$1$mF86/UHC$WvcIcX2t6crBz2onWxyac.":
+           status.append(_("The default password used by the sample templates for newly installed machines (default_password_crypted in /etc/cobbler/settings) is still set to 'cobbler' and should be changed, try: \"openssl passwd -1 -salt 'random-phrase-here' 'your-password-here'\" to generate new one"))
+
+
+   def check_for_unreferenced_repos(self,status):
+        repos = []
+        referenced = []
+        not_found = []
+        for r in self.config.api.repos():
+            repos.append(r.name)
+        for p in self.config.api.profiles():
+            my_repos = p.repos
+            if my_repos != "<<inherit>>":
+                referenced.extend(my_repos)
+        for r in referenced:
+            if r not in repos and r != "<<inherit>>":
+                not_found.append(r)
+        if len(not_found) > 0:
+            status.append(_("One or more repos referenced by profile objects is no longer defined in cobbler: %s") % ", ".join(not_found))
+       
+   def check_for_unsynced_repos(self,status):
+       need_sync = []
+       for r in self.config.repos():
+           if r.mirror_locally == 1:
+               lookfor = os.path.join(self.settings.webdir, "repo_mirror", r.name)
+               if not os.path.exists(lookfor):
+                   need_sync.append(r.name)
+       if len(need_sync) > 0:
+           status.append(_("One or more repos need to be processed by cobbler reposync for the first time before kickstarting against them: %s") % ", ".join(need_sync))
+
+
+   def check_httpd(self,status):
+       """
+       Check if Apache is installed.
+       """
+       if self.checked_dist in [ "suse", "redhat" ]:
+           rc = utils.subprocess_get(self.logger,"httpd -v")
+       else:
+           rc = utils.subprocess_get(self.logger,"apache2 -v")
+       if rc.find("Server") == -1:
+           status.append("Apache (httpd) is not installed and/or in path")
+
+
+   def check_dhcpd_bin(self,status):
+       """
+       Check if dhcpd is installed
+       """
+       if not os.path.exists("/usr/sbin/dhcpd"):
+           status.append("dhcpd is not installed")
+
+   def check_dnsmasq_bin(self,status):
+       """
+       Check if dnsmasq is installed
+       """
+       rc = utils.subprocess_get(self.logger,"dnsmasq --help")
+       if rc.find("Valid options") == -1:
+           status.append("dnsmasq is not installed and/or in path")
+
+   def check_bind_bin(self,status):
+       """
+       Check if bind is installed.
+       """
+       rc = utils.subprocess_get(self.logger,"named -v")
+       # it should return something like "BIND 9.6.1-P1-RedHat-9.6.1-6.P1.fc11"
+       if rc.find("BIND") == -1:
+           status.append("named is not installed and/or in path")
+       
+   def check_bootloaders(self,status):
+       """
+       Check if network bootloaders are installed
+       """
+       # FIXME: move zpxe.rexx to loaders
+
+       bootloaders = {
+          "elilo"      : [ "/var/lib/cobbler/loaders/elilo*.efi" ],
+          "menu.c32"   : [ "/usr/share/syslinux/menu.c32",
+              "/usr/lib/syslinux/menu.c32",
+              "/var/lib/cobbler/loaders/menu.c32" ],
+          "yaboot"     : [ "/var/lib/cobbler/loaders/yaboot*" ],
+          "pxelinux.0" : [ "/usr/share/syslinux/pxelinux.0",
+              "/usr/lib/syslinux/pxelinux.0",
+              "/var/lib/cobbler/loaders/pxelinux.0" ],
+          "efi"        : [ "/var/lib/cobbler/loaders/grub-x86.efi",
+              "/var/lib/cobbler/loaders/grub-x86_64.efi" ],
+       }
+
+       # look for bootloaders at the glob locations above
+       found_bootloaders = []
+       items = bootloaders.keys()
+       for loader_name in items:
+          patterns = bootloaders[loader_name]
+          for pattern in patterns:
+             matches = glob.glob(pattern)
+             if len(matches) > 0:
+                 found_bootloaders.append(loader_name)
+       not_found = []
+
+       # invert the list of what we've found so we can report on what we haven't found
+       for loader_name in items:
+          if loader_name not in found_bootloaders:
+             not_found.append(loader_name)
+
+       if len(not_found) > 0:
+          status.append("some network boot-loaders are missing from /var/lib/cobbler/loaders, you may run 'cobbler get-loaders' to download them, or, if you only want to handle x86/x86_64 netbooting, you may ensure that you have installed a *recent* version of the syslinux package installed and can ignore this message entirely.  Files in this directory, should you want to support all architectures, should include pxelinux.0, menu.c32, elilo.efi, and yaboot. The 'cobbler get-loaders' command is the easiest way to resolve these requirements.")
+ 
+   def check_tftpd_bin(self,status):
+       """
+       Check if tftpd is installed
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if not os.path.exists("/etc/xinetd.d/tftp"):
+          status.append("missing /etc/xinetd.d/tftp, install tftp-server?")
+
+   def check_tftpd_dir(self,status):
+       """
+       Check if cobbler.conf's tftpboot directory exists
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       bootloc = utils.tftpboot_location()
+       if not os.path.exists(bootloc):
+          status.append(_("please create directory: %(dirname)s") % { "dirname" : bootloc })
+
+
+   def check_tftpd_conf(self,status):
+       """
+       Check that configured tftpd boot directory matches with actual
+       Check that tftpd is enabled to autostart
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if os.path.exists("/etc/xinetd.d/tftp"):
+          f = open("/etc/xinetd.d/tftp")
+          re_disable = re.compile(r'disable.*=.*yes')
+          for line in f.readlines():
+             if re_disable.search(line) and not line.strip().startswith("#"):
+                 status.append(_("change 'disable' to 'no' in %(file)s") % { "file" : "/etc/xinetd.d/tftp" })
+       else:
+          status.append("missing configuration file: /etc/xinetd.d/tftp")
+
+   def check_ctftpd_bin(self,status):
+       """
+       Check if the Cobbler tftp server is installed
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if not os.path.exists("/etc/xinetd.d/ctftp"):
+          status.append("missing /etc/xinetd.d/ctftp")
+
+   def check_ctftpd_dir(self,status):
+       """
+       Check if cobbler.conf's tftpboot directory exists
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       bootloc = utils.tftpboot_location()
+       if not os.path.exists(bootloc):
+          status.append(_("please create directory: %(dirname)s") % { "dirname" : bootloc })
+
+   def check_ctftpd_conf(self,status):
+       """
+       Check that configured tftpd boot directory matches with actual
+       Check that tftpd is enabled to autostart
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if os.path.exists("/etc/xinetd.d/tftp"):
+          f = open("/etc/xinetd.d/tftp")
+          re_disable = re.compile(r'disable.*=.*no')
+          for line in f.readlines():
+             if re_disable.search(line) and not line.strip().startswith("#"):
+                 status.append(_("change 'disable' to 'yes' in %(file)s") % { "file" : "/etc/xinetd.d/tftp" })
+       if os.path.exists("/etc/xinetd.d/ctftp"):
+          f = open("/etc/xinetd.d/ctftp")
+          re_disable = re.compile(r'disable.*=.*yes')
+          for line in f.readlines():
+             if re_disable.search(line) and not line.strip().startswith("#"):
+                 status.append(_("change 'disable' to 'no' in %(file)s") % { "file" : "/etc/xinetd.d/ctftp" })
+       else:
+          status.append("missing configuration file: /etc/xinetd.d/ctftp")
+
+   def check_rsync_conf(self,status):
+       """
+       Check that rsync is enabled to autostart
+       """
+       if self.checked_dist in ["debian", "ubuntu"]:
+          return
+
+       if os.path.exists("/etc/xinetd.d/rsync"):
+          f = open("/etc/xinetd.d/rsync")
+          re_disable = re.compile(r'disable.*=.*yes')
+          for line in f.readlines():
+             if re_disable.search(line) and not line.strip().startswith("#"):
+                 status.append(_("change 'disable' to 'no' in %(file)s") % { "file" : "/etc/xinetd.d/rsync" })
+       else:
+          status.append(_("file %(file)s does not exist") % { "file" : "/etc/xinetd.d/rsync" })
+
+
+   def check_dhcpd_conf(self,status):
+       """
+       NOTE: this code only applies if cobbler is *NOT* set to generate
+       a dhcp.conf file
+
+       Check that dhcpd *appears* to be configured for pxe booting.
+       We can't assure file correctness.  Since a cobbler user might
+       have dhcp on another server, it's okay if it's not there and/or
+       not configured correctly according to automated scans.
+       """
+       if not (self.settings.manage_dhcp == 0):
+           return
+
+       if os.path.exists(self.settings.dhcpd_conf):
+           match_next = False
+           match_file = False
+           f = open(self.settings.dhcpd_conf)
+           for line in f.readlines():
+               if line.find("next-server") != -1:
+                   match_next = True
+               if line.find("filename") != -1:
+                   match_file = True
+           if not match_next:
+              status.append(_("expecting next-server entry in %(file)s") % { "file" : self.settings.dhcpd_conf })
+           if not match_file:
+              status.append(_("missing file: %(file)s") % { "file" : self.settings.dhcpd_conf })
+       else:
+           status.append(_("missing file: %(file)s") % { "file" : self.settings.dhcpd_conf })
+

=== added directory '.pc/40_ubuntu_bind9_management.patch/cobbler/modules'
=== added file '.pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py'
--- .pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py	1970-01-01 00:00:00 +0000
+++ .pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py	2011-04-18 12:44:31 +0000
@@ -0,0 +1,332 @@
+"""
+This is some of the code behind 'cobbler sync'.
+
+Copyright 2006-2009, Red Hat, Inc
+Michael DeHaan <[e-mail]>
+John Eckersberg <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301  USA
+"""
+
+import os
+import os.path
+import shutil
+import time
+import sys
+import glob
+import traceback
+import errno
+import re
+from shlex import shlex
+
+
+import utils
+from cexceptions import *
+import templar 
+
+import item_distro
+import item_profile
+import item_repo
+import item_system
+
+from utils import _
+
+
+def register():
+   """
+   The mandatory cobbler module registration hook.
+   """
+   return "manage"
+
+
+class BindManager:
+
+    def what(self):
+        return "bind"
+
+    def __init__(self,config,logger):
+        """
+        Constructor
+        """
+        self.logger      = logger
+        self.config      = config
+        self.api         = config.api
+        self.distros     = config.distros()
+        self.profiles    = config.profiles()
+        self.systems     = config.systems()
+        self.settings    = config.settings()
+        self.repos       = config.repos()
+        self.templar     = templar.Templar(config)
+
+    def regen_hosts(self):
+        pass # not used
+
+    def __forward_zones(self):
+        """
+        Returns a map of zones and the records that belong
+        in them
+        """
+        zones = {}
+        forward_zones = self.settings.manage_forward_zones
+        if type(forward_zones) != type([]):
+           # gracefully handle when user inputs only a single zone
+           # as a string instead of a list with only a single item
+           forward_zones = [forward_zones]
+
+        for zone in forward_zones:
+           zones[zone] = {}
+
+        for system in self.systems:
+            for (name, interface) in system.interfaces.iteritems():
+                host = interface["dns_name"]
+                ip   = interface["ip_address"]
+                if not system.is_management_supported(cidr_ok=False):
+                    continue
+                if not host or not ip:
+                    # gotsta have some dns_name and ip or else!
+                    continue
+                if host.find(".") == -1:
+                    continue
+
+                # match the longest zone!
+                # e.g. if you have a host a.b.c.d.e
+                # if manage_forward_zones has:
+                # - c.d.e
+                # - b.c.d.e
+                # then a.b.c.d.e should go in b.c.d.e
+                best_match = ''
+                for zone in zones.keys():
+                   if re.search('\.%s$' % zone, host) and len(zone) > len(best_match):
+                      best_match = zone
+
+                if best_match == '': # no match
+                   continue
+
+                # strip the zone off the dns_name and append the
+                # remainder + ip to the zone list
+                host = re.sub('\.%s$' % best_match, '', host)
+
+                zones[best_match][host] = ip
+
+        return zones
+
+    def __reverse_zones(self):
+        """
+        Returns a map of zones and the records that belong
+        in them
+        """
+        zones = {}
+        reverse_zones = self.settings.manage_reverse_zones
+        if type(reverse_zones) != type([]):
+           # gracefully handle when user inputs only a single zone
+           # as a string instead of a list with only a single item
+           reverse_zones = [reverse_zones]
+
+        for zone in reverse_zones:
+           zones[zone] = {}
+
+        for sys in self.systems:
+            for (name, interface) in sys.interfaces.iteritems():
+                host = interface["dns_name"]
+                ip   = interface["ip_address"]
+                if not sys.is_management_supported(cidr_ok=False):
+                    continue
+                if not host or not ip:
+                    # gotsta have some dns_name and ip or else!
+                    continue
+
+                # match the longest zone!
+                # e.g. if you have an ip 1.2.3.4
+                # if manage_reverse_zones has:
+                # - 1.2
+                # - 1.2.3
+                # then 1.2.3.4 should go in 1.2.3
+                best_match = ''
+                for zone in zones.keys():
+                   if re.search('^%s\.' % zone, ip) and len(zone) > len(best_match):
+                      best_match = zone
+
+                if best_match == '': # no match
+                   continue
+
+                # strip the zone off the front of the ip
+                # reverse the rest of the octets
+                # append the remainder + dns_name
+                ip = ip.replace(best_match, '', 1)
+                if ip[0] == '.': # strip leading '.' if it's there
+                   ip = ip[1:]
+                tokens = ip.split('.')
+                tokens.reverse()
+                ip = '.'.join(tokens)
+                zones[best_match][ip] = host + '.'
+
+        return zones
+
+
+    def __write_named_conf(self):
+        """
+        Write out the named.conf main config file from the template.
+        """
+        settings_file = "/etc/named.conf"
+        template_file = "/etc/cobbler/named.template"
+        forward_zones = self.settings.manage_forward_zones
+        reverse_zones = self.settings.manage_reverse_zones
+
+        metadata = {'forward_zones': self.__forward_zones().keys(),
+                    'reverse_zones': [],
+                    'zone_include': ''}
+
+        for zone in metadata['forward_zones']:
+                txt =  """
+zone "%(zone)s." {
+    type master;
+    file "%(zone)s";
+};
+""" % {'zone': zone}
+                metadata['zone_include'] = metadata['zone_include'] + txt
+
+        for zone in self.__reverse_zones().keys():
+                tokens = zone.split('.')
+                tokens.reverse()
+                arpa = '.'.join(tokens) + '.in-addr.arpa'
+                metadata['reverse_zones'].append((zone, arpa))
+                txt = """
+zone "%(arpa)s." {
+    type master;
+    file "%(zone)s";
+};
+""" % {'arpa': arpa, 'zone': zone}
+                metadata['zone_include'] = metadata['zone_include'] + txt
+
+        try:
+            f2 = open(template_file,"r")
+        except:
+            raise CX(_("error reading template from file: %s") % template_file)
+        template_data = ""
+        template_data = f2.read()
+        f2.close()
+
+        if self.logger is not None:
+            self.logger.info("generating %s" % settings_file)
+        self.templar.render(template_data, metadata, settings_file, None)
+
+    def __ip_sort(self, ips):
+        """
+        Sorts IP addresses (or partial addresses) in a numerical fashion per-octet
+        """
+        # strings to integer octet chunks so we can sort numerically
+        octets = map(lambda x: [int(i) for i in x.split('.')], ips)
+        octets.sort()
+        # integers back to strings
+        octets = map(lambda x: [str(i) for i in x], octets)
+        return ['.'.join(i) for i in octets]
+
+    def __pretty_print_host_records(self, hosts, rectype='A', rclass='IN'):
+        """
+        Format host records by order and with consistent indentation
+        """
+        names = [k for k,v in hosts.iteritems()]
+        if not names: return '' # zones with no hosts
+
+        if rectype == 'PTR':
+           names = self.__ip_sort(names)
+        else:
+           names.sort()
+
+        max_name = max([len(i) for i in names])
+
+        s = ""
+        for name in names:
+           spacing = " " * (max_name - len(name))
+           my_name = "%s%s" % (name, spacing)
+           my_host = hosts[name]
+           s += "%s  %s  %s  %s\n" % (my_name, rclass, rectype, my_host)
+        return s
+
+    def __write_zone_files(self):
+        """
+        Write out the forward and reverse zone files for all configured zones
+        """
+        default_template_file = "/etc/cobbler/zone.template"
+        cobbler_server = self.settings.server
+        serial = int(time.time())
+        forward = self.__forward_zones()
+        reverse = self.__reverse_zones()
+
+        try:
+            f2 = open(default_template_file,"r")
+        except:
+            raise CX(_("error reading template from file: %s") % default_template_file)
+        default_template_data = ""
+        default_template_data = f2.read()
+        f2.close()
+
+        for (zone, hosts) in forward.iteritems():
+            metadata = {
+                'cobbler_server': cobbler_server,
+                'serial': serial,
+                'host_record': ''
+            }
+
+            # grab zone-specific template if it exists
+            try:
+               fd = open('/etc/cobbler/zone_templates/%s' % zone)
+               template_data = fd.read()
+               fd.close()
+            except:
+               template_data = default_template_data
+
+            metadata['host_record'] = self.__pretty_print_host_records(hosts)
+
+            zonefilename='/var/named/' + zone
+            if self.logger is not None:
+               self.logger.info("generating (forward) %s" % zonefilename)
+            self.templar.render(template_data, metadata, zonefilename, None)
+
+        for (zone, hosts) in reverse.iteritems():
+            metadata = {
+                'cobbler_server': cobbler_server,
+                'serial': serial,
+                'host_record': ''
+            }
+
+            # grab zone-specific template if it exists
+            try:
+               fd = open('/etc/cobbler/zone_templates/%s' % zone)
+               template_data = fd.read()
+               fd.close()
+            except:
+               template_data = default_template_data
+
+            metadata['host_record'] = self.__pretty_print_host_records(hosts, rectype='PTR')
+
+            zonefilename='/var/named/' + zone
+            if self.logger is not None:
+               self.logger.info("generating (reverse) %s" % zonefilename)
+            self.templar.render(template_data, metadata, zonefilename, None)
+
+
+    def write_dns_files(self):
+        """
+        BIND files are written when manage_dns is set in
+        /var/lib/cobbler/settings.
+        """
+
+        self.__write_named_conf()
+        self.__write_zone_files()
+
+def get_manager(config,logger):
+    return BindManager(config,logger)

=== added file '.pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py'
--- .pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py	1970-01-01 00:00:00 +0000
+++ .pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py	2011-04-18 12:44:31 +0000
@@ -0,0 +1,66 @@
+import distutils.sysconfig
+import sys
+import os
+import traceback
+import cexceptions
+import os
+import sys
+import xmlrpclib
+import cobbler.module_loader as module_loader
+import cobbler.utils as utils
+
+plib = distutils.sysconfig.get_python_lib()
+mod_path="%s/cobbler" % plib
+sys.path.insert(0, mod_path)
+
+def register():
+    # this pure python trigger acts as if it were a legacy shell-trigger, but is much faster.
+    # the return of this method indicates the trigger type
+    return "/var/lib/cobbler/triggers/sync/post/*"
+
+def run(api,args,logger):
+
+    settings = api.settings()
+
+    manage_dhcp        = str(settings.manage_dhcp).lower()
+    manage_dns         = str(settings.manage_dns).lower()
+    manage_tftpd       = str(settings.manage_tftpd).lower()
+    restart_dhcp       = str(settings.restart_dhcp).lower()
+    restart_dns        = str(settings.restart_dns).lower()
+
+    which_dhcp_module = module_loader.get_module_from_file("dhcp","module",just_name=True).strip()
+    which_dns_module  = module_loader.get_module_from_file("dns","module",just_name=True).strip()
+
+    # special handling as we don't want to restart it twice
+    has_restarted_dnsmasq = False
+
+    rc = 0
+    if manage_dhcp != "0":
+        if which_dhcp_module == "manage_isc":
+            if restart_dhcp != "0":
+                rc = utils.subprocess_call(logger, "dhcpd -t -q", shell=True)
+                if rc != 0:
+                   logger.error("dhcpd -t failed")
+                   return 1
+                rc = utils.subprocess_call(logger,"service isc-dhcp-server restart", shell=True)
+        elif which_dhcp_module == "manage_dnsmasq":
+            if restart_dhcp != "0":
+                rc = utils.subprocess_call(logger, "service dnsmasq restart")
+                has_restarted_dnsmasq = True
+        else:
+            logger.error("unknown DHCP engine: %s" % which_dhcp_module)
+            rc = 411
+
+    if manage_dns != "0" and restart_dns != "0":
+        if which_dns_module == "manage_bind":
+            rc = utils.subprocess_call(logger, "service named restart", shell=True)
+        elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq:
+            rc = utils.subprocess_call(logger, "service dnsmasq restart", shell=True)
+        elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq:
+            rc = 0
+        else:
+            logger.error("unknown DNS engine: %s" % which_dns_module)
+            rc = 412
+
+    return rc
+

=== added directory '.pc/40_ubuntu_bind9_management.patch/templates'
=== added directory '.pc/40_ubuntu_bind9_management.patch/templates/etc'
=== added file '.pc/40_ubuntu_bind9_management.patch/templates/etc/named.template'
--- .pc/40_ubuntu_bind9_management.patch/templates/etc/named.template	1970-01-01 00:00:00 +0000
+++ .pc/40_ubuntu_bind9_management.patch/templates/etc/named.template	2011-04-18 12:44:31 +0000
@@ -0,0 +1,31 @@
+options {
+          listen-on port 53 { 127.0.0.1; };
+          directory       "/var/named";
+          dump-file       "/var/named/data/cache_dump.db";
+          statistics-file "/var/named/data/named_stats.txt";
+          memstatistics-file "/var/named/data/named_mem_stats.txt";
+          allow-query     { localhost; };
+          recursion yes;
+};
+
+logging {
+        channel default_debug {
+                file "data/named.run";
+                severity dynamic;
+        };
+};
+
+#for $zone in $forward_zones
+zone "${zone}." {
+    type master;
+    file "$zone";
+};
+
+#end for
+#for $zone, $arpa in $reverse_zones
+zone "${arpa}." {
+    type master;
+    file "$zone";
+};
+
+#end for

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-04-15 12:47:39 +0000
+++ .pc/applied-patches	2011-04-18 12:44:31 +0000
@@ -10,3 +10,4 @@
 37_koan_install_tree.patch
 38_koan_qcreate_ubuntu_support.patch
 39_cw_remove_vhost.patch
+40_ubuntu_bind9_management.patch

=== modified file 'cobbler/action_check.py'
--- cobbler/action_check.py	2011-01-18 12:03:14 +0000
+++ cobbler/action_check.py	2011-04-18 12:44:31 +0000
@@ -66,7 +66,7 @@
            mode = self.config.api.get_sync().dns.what()
            if mode == "bind":
                self.check_bind_bin(status)
-               self.check_service(status,"named")
+               self.check_service(status,"bind9")
            elif mode == "dnsmasq" and not self.settings.manage_dhcp:
                self.check_dnsmasq_bin(status)
                self.check_service(status,"dnsmasq")

=== modified file 'cobbler/modules/manage_bind.py'
--- cobbler/modules/manage_bind.py	2011-01-18 12:03:14 +0000
+++ cobbler/modules/manage_bind.py	2011-04-18 12:44:31 +0000
@@ -180,7 +180,7 @@
         """
         Write out the named.conf main config file from the template.
         """
-        settings_file = "/etc/named.conf"
+        settings_file = "/etc/bind/named.conf.local"
         template_file = "/etc/cobbler/named.template"
         forward_zones = self.settings.manage_forward_zones
         reverse_zones = self.settings.manage_reverse_zones
@@ -291,7 +291,7 @@
 
             metadata['host_record'] = self.__pretty_print_host_records(hosts)
 
-            zonefilename='/var/named/' + zone
+            zonefilename='/etc/bind/db.' + zone
             if self.logger is not None:
                self.logger.info("generating (forward) %s" % zonefilename)
             self.templar.render(template_data, metadata, zonefilename, None)
@@ -313,7 +313,7 @@
 
             metadata['host_record'] = self.__pretty_print_host_records(hosts, rectype='PTR')
 
-            zonefilename='/var/named/' + zone
+            zonefilename='/etc/bind/db.' + zone
             if self.logger is not None:
                self.logger.info("generating (reverse) %s" % zonefilename)
             self.templar.render(template_data, metadata, zonefilename, None)

=== modified file 'cobbler/modules/sync_post_restart_services.py'
--- cobbler/modules/sync_post_restart_services.py	2011-01-28 14:39:12 +0000
+++ cobbler/modules/sync_post_restart_services.py	2011-04-18 12:44:31 +0000
@@ -53,7 +53,7 @@
 
     if manage_dns != "0" and restart_dns != "0":
         if which_dns_module == "manage_bind":
-            rc = utils.subprocess_call(logger, "service named restart", shell=True)
+            rc = utils.subprocess_call(logger, "service bind9 restart", shell=True)
         elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq:
             rc = utils.subprocess_call(logger, "service dnsmasq restart", shell=True)
         elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq:

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-15 12:47:39 +0000
+++ debian/changelog	2011-04-18 12:44:31 +0000
@@ -1,3 +1,14 @@
+cobbler (2.1.0-0ubuntu7) natty; urgency=low
+
+  * Fixed management of bind9 (LP: #764391):
+    - debian/patches/40_ubuntu_bind9_management.patch:
+      - Manage bind9 instead of named daemon.
+      - Generate configuration in /etc/bind.
+      - Use default bind9 configuration as much as possible.
+    - debian/control: Added Suggests: bind9 to cobbler.
+
+ -- James Page <[e-mail]>  Mon, 18 Apr 2011 11:15:59 +0100
+
 cobbler (2.1.0-0ubuntu6) natty; urgency=low
 
   * Fix DocumentRoot conflict with default vhost (LP: #760012)

=== modified file 'debian/control'
--- debian/control	2011-04-04 12:55:44 +0000
+++ debian/control	2011-04-18 12:44:31 +0000
@@ -34,6 +34,7 @@
  cobbler-web,
  debmirror
 Suggests: createrepo,
+ bind9,
  dhcp3-server,
  genisoimage,
  cman,

=== added file 'debian/patches/40_ubuntu_bind9_management.patch'
--- debian/patches/40_ubuntu_bind9_management.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/40_ubuntu_bind9_management.patch	2011-04-18 12:44:31 +0000
@@ -0,0 +1,103 @@
+Description: Enable management of Ubuntu bind9 with manage_dns setting.
+ - Generate /etc/bind/named.conf.local to plug into the standard Ubuntu bind9 
+   install and preserve the bind9 default installation configuration.
+ - Generate /etc/bind/db.$zone to align to bind9 zone file names.
+ - Restart/check bind9 rather than named.
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+
+Index: fix-764391/templates/etc/named.template
+===================================================================
+--- fix-764391.orig/templates/etc/named.template	2011-04-18 10:46:43.057345158 +0100
++++ fix-764391/templates/etc/named.template	2011-04-18 10:47:23.426906461 +0100
+@@ -1,31 +1,14 @@
+-options {
+-          listen-on port 53 { 127.0.0.1; };
+-          directory       "/var/named";
+-          dump-file       "/var/named/data/cache_dump.db";
+-          statistics-file "/var/named/data/named_stats.txt";
+-          memstatistics-file "/var/named/data/named_mem_stats.txt";
+-          allow-query     { localhost; };
+-          recursion yes;
+-};
+-
+-logging {
+-        channel default_debug {
+-                file "data/named.run";
+-                severity dynamic;
+-        };
+-};
+-
+ #for $zone in $forward_zones
+ zone "${zone}." {
+     type master;
+-    file "$zone";
++    file "/etc/bind/db.$zone";
+ };
+ 
+ #end for
+ #for $zone, $arpa in $reverse_zones
+ zone "${arpa}." {
+     type master;
+-    file "$zone";
++    file "/etc/bind/db.$zone";
+ };
+ 
+ #end for
+Index: fix-764391/cobbler/modules/manage_bind.py
+===================================================================
+--- fix-764391.orig/cobbler/modules/manage_bind.py	2011-04-18 10:47:46.226932274 +0100
++++ fix-764391/cobbler/modules/manage_bind.py	2011-04-18 10:49:00.526931926 +0100
+@@ -180,7 +180,7 @@
+         """
+         Write out the named.conf main config file from the template.
+         """
+-        settings_file = "/etc/named.conf"
++        settings_file = "/etc/bind/named.conf.local"
+         template_file = "/etc/cobbler/named.template"
+         forward_zones = self.settings.manage_forward_zones
+         reverse_zones = self.settings.manage_reverse_zones
+@@ -291,7 +291,7 @@
+ 
+             metadata['host_record'] = self.__pretty_print_host_records(hosts)
+ 
+-            zonefilename='/var/named/' + zone
++            zonefilename='/etc/bind/db.' + zone
+             if self.logger is not None:
+                self.logger.info("generating (forward) %s" % zonefilename)
+             self.templar.render(template_data, metadata, zonefilename, None)
+@@ -313,7 +313,7 @@
+ 
+             metadata['host_record'] = self.__pretty_print_host_records(hosts, rectype='PTR')
+ 
+-            zonefilename='/var/named/' + zone
++            zonefilename='/etc/bind/db.' + zone
+             if self.logger is not None:
+                self.logger.info("generating (reverse) %s" % zonefilename)
+             self.templar.render(template_data, metadata, zonefilename, None)
+Index: fix-764391/cobbler/action_check.py
+===================================================================
+--- fix-764391.orig/cobbler/action_check.py	2011-04-18 10:50:24.566792922 +0100
++++ fix-764391/cobbler/action_check.py	2011-04-18 10:50:49.546726457 +0100
+@@ -66,7 +66,7 @@
+            mode = self.config.api.get_sync().dns.what()
+            if mode == "bind":
+                self.check_bind_bin(status)
+-               self.check_service(status,"named")
++               self.check_service(status,"bind9")
+            elif mode == "dnsmasq" and not self.settings.manage_dhcp:
+                self.check_dnsmasq_bin(status)
+                self.check_service(status,"dnsmasq")
+Index: fix-764391/cobbler/modules/sync_post_restart_services.py
+===================================================================
+--- fix-764391.orig/cobbler/modules/sync_post_restart_services.py	2011-04-18 10:55:38.985302648 +0100
++++ fix-764391/cobbler/modules/sync_post_restart_services.py	2011-04-18 10:55:56.105188050 +0100
+@@ -53,7 +53,7 @@
+ 
+     if manage_dns != "0" and restart_dns != "0":
+         if which_dns_module == "manage_bind":
+-            rc = utils.subprocess_call(logger, "service named restart", shell=True)
++            rc = utils.subprocess_call(logger, "service bind9 restart", shell=True)
+         elif which_dns_module == "manage_dnsmasq" and not has_restarted_dnsmasq:
+             rc = utils.subprocess_call(logger, "service dnsmasq restart", shell=True)
+         elif which_dns_module == "manage_dnsmasq" and has_restarted_dnsmasq:

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-15 12:47:39 +0000
+++ debian/patches/series	2011-04-18 12:44:31 +0000
@@ -10,3 +10,4 @@
 37_koan_install_tree.patch
 38_koan_qcreate_ubuntu_support.patch
 39_cw_remove_vhost.patch
+40_ubuntu_bind9_management.patch

=== modified file 'templates/etc/named.template'
--- templates/etc/named.template	2011-01-18 12:03:14 +0000
+++ templates/etc/named.template	2011-04-18 12:44:31 +0000
@@ -1,31 +1,14 @@
-options {
-          listen-on port 53 { 127.0.0.1; };
-          directory       "/var/named";
-          dump-file       "/var/named/data/cache_dump.db";
-          statistics-file "/var/named/data/named_stats.txt";
-          memstatistics-file "/var/named/data/named_mem_stats.txt";
-          allow-query     { localhost; };
-          recursion yes;
-};
-
-logging {
-        channel default_debug {
-                file "data/named.run";
-                severity dynamic;
-        };
-};
-
 #for $zone in $forward_zones
 zone "${zone}." {
     type master;
-    file "$zone";
+    file "/etc/bind/db.$zone";
 };
 
 #end for
 #for $zone, $arpa in $reverse_zones
 zone "${arpa}." {
     type master;
-    file "$zone";
+    file "/etc/bind/db.$zone";
 };
 
 #end for