From f930ee284c1d068927d686b340db09b3fc2764fe Mon Sep 17 00:00:00 2001
From: Ken Raffenetti <raffenet@mcs.anl.gov>
Date: Fri, 8 Dec 2006 21:34:03 +0000
Subject: fixed bug in reverse lookup generation

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2574 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Server/Hostbase/templates/reverseappend.tmpl | 2 +-
 src/lib/Server/Plugins/Hostbase.py                   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/Server/Hostbase/templates/reverseappend.tmpl b/src/lib/Server/Hostbase/templates/reverseappend.tmpl
index 64efe6e15..c45d42352 100644
--- a/src/lib/Server/Hostbase/templates/reverseappend.tmpl
+++ b/src/lib/Server/Hostbase/templates/reverseappend.tmpl
@@ -1,4 +1,4 @@
 {% if fileorigin %}$ORIGIN {{ fileorigin }}.in-addr.arpa.{% endif %}
 $ORIGIN {{ inaddr }}.in-addr.arpa.
-{% for host in hosts %}{% ifequal host.2 0 %}{{ host.3.3 }}			PTR	{{ host.0 }}.{% else %}{{ host.3.3 }}			PTR	{{ host.4.0 }}-{{ host.3.2 }}.{{ host.4.1 }}.{% endifequal %}
+{% for host in hosts %}{{ host.0.3 }}			PTR	{{ host.1.0 }}.{{ host.1.1 }}
 {% endfor %}
diff --git a/src/lib/Server/Plugins/Hostbase.py b/src/lib/Server/Plugins/Hostbase.py
index 85766ed65..55b73b7da 100644
--- a/src/lib/Server/Plugins/Hostbase.py
+++ b/src/lib/Server/Plugins/Hostbase.py
@@ -2,7 +2,7 @@
 __revision__ = '$Revision$'
 
 import sys, os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'Hostbase.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'Bcfg2.Server.Hostbase.settings'
 from lxml.etree import Element, SubElement
 from syslog import syslog, LOG_INFO
 from Bcfg2.Server.Plugin import Plugin, PluginExecutionError, PluginInitError, DirectoryBacked
@@ -235,6 +235,7 @@ class Hostbase(Plugin):
 
         reversenames.sort()
         for filename in reversenames:
+            print filename
             originlist = []
             cursor.execute("""
             SELECT h.hostname, p.ip_addr FROM ((hostbase_host h
@@ -250,7 +251,7 @@ class Hostbase(Plugin):
                  if (".".join([ip[1].split(".")[2], filename[0]]),
                      ".".join([filename[1], ip[1].split(".")[2]])) not in originlist]
                 for origin in originlist:
-                    hosts = [host.__add__((host[1].split("."), host[0].split(".", 1)))
+                    hosts = [(host[1].split("."), host[0].split(".", 1))
                              for host in reversehosts
                              if host[1].rstrip('0123456789').rstrip('.') == origin[1]]
                     context = Context({
@@ -261,7 +262,7 @@ class Hostbase(Plugin):
                     self.filedata['%s.rev' % filename[0]] += self.templates['reverseapp'].render(context)
             else:
                 originlist = [filename[0]]
-                hosts = [host.__add__((host[1].split("."), host[0].split(".", 1)))
+                hosts = [(host[1].split("."), host[0].split(".", 1))
                          for host in reversehosts]
                 context = Context({
                     'hosts': hosts,
@@ -269,6 +270,7 @@ class Hostbase(Plugin):
                     'fileorigin': None,
                     })        
                 self.filedata['%s.rev' % filename[0]] += self.templates['reverseapp'].render(context)
+            print hosts
             self.Entries['ConfigFile']['%s/%s.rev' % (self.filepath, filename[0])] = self.FetchFile
 
     def buildDHCP(self):
-- 
cgit v1.2.3-1-g7c22