various tweaks to templates

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3058 ce84e21b-d406-0410-9b95-82705330c041

5 files changed, 15 insertions, 8 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/models.py b/src/lib/Server/Hostbase/hostbase/models.py
index dbb63cc3a..e828cddce 100644
--- a/src/lib/Server/Hostbase/hostbase/models.py
+++ b/src/lib/Server/Hostbase/hostbase/models.py
@@ -107,7 +107,7 @@ class MX(models.Model):
 class Name(models.Model):
     DNS_CHOICES = (
         ('global','global'),('internal','ANL internal'),
-        ('mcs-internal','MCS internal'),('private','private')
+        ('private','private')
         )
     ip = models.ForeignKey(IP, edit_inline=models.TABULAR, num_in_admin=1)
     name = models.CharField(maxlength=64, core=True)
diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Server/Hostbase/settings.py
index 378239522..ac2dc5fab 100644
--- a/src/lib/Server/Hostbase/settings.py
+++ b/src/lib/Server/Hostbase/settings.py
@@ -38,7 +38,7 @@ DATABASE_HOST = options['database_host']
 DATABASE_PORT = int(options['database_port'])
 # Local time zone for this installation. All choices can be found here:
 # http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-TIME_ZONE = ''
+TIME_ZONE = 'America/Chicago'
 
 # enter the defauly MX record machines will get in Hostbase
 # this setting may move elsewhere eventually
diff --git a/src/lib/Server/Hostbase/templates/hosts.tmpl b/src/lib/Server/Hostbase/templates/hosts.tmpl
index 4fded9d55..251cb5a79 100644
--- a/src/lib/Server/Hostbase/templates/hosts.tmpl
+++ b/src/lib/Server/Hostbase/templates/hosts.tmpl
@@ -9,17 +9,17 @@
 127.0.0.1	localhost.mcs.anl.gov localhost
 
 #  This file lists hosts in these domains:
-{% for domain in domain_data %}{{ domain.0 }}: {{ domain.1 }}
+{% for domain in domain_data %}#	{{ domain.0 }}: {{ domain.1 }}
 {% endfor %}
 #
 #  This file lists hosts on these networks:
 #
 #    Network        Hosts
 #    ---------------------------------------------------------------------
-{% for octet in two_octets_data %}{{ octet.0 }}		{{octet.1 }}
+{% for octet in two_octets_data %}#	{{ octet.0 }}		{{octet.1 }}
 {% endfor %}
 #
-{% for octet in three_octets_data %}{{ octet.0 }}       		{{ octet.1 }}
+{% for octet in three_octets_data %}#	{{ octet.0 }}       		{{ octet.1 }}
 {% endfor %}
 #
 #  Total host interfaces (ip addresses) in this file: {{ num_ips }}
diff --git a/src/lib/Server/Hostbase/templates/named.tmpl b/src/lib/Server/Hostbase/templates/named.tmpl
index 7a227c04e..eb1b2ddfe 100644
--- a/src/lib/Server/Hostbase/templates/named.tmpl
+++ b/src/lib/Server/Hostbase/templates/named.tmpl
@@ -7,6 +7,8 @@
 
 include "/etc/bind/named.conf.options";
 
+include "/etc/bind/rndc.key";
+
 // prime the server with knowledge of the root servers
 zone "." {
 	type hint;
@@ -18,7 +20,9 @@ zone "." {
 {% for zone in zones %}
 zone "{{ zone.1 }}" {
 	type master;
-	file "/etc/bind/{{ zone.1 }}";
+	file "/etc/bind/hostbase/{{ zone.1 }}";
+	notify no;
+	also-notify { 140.221.9.6;140.221.8.10; };
 };{% endfor %}
 
 zone "localhost" {
@@ -43,7 +47,9 @@ zone "255.in-addr.arpa" {
 {% for reverse in reverses %}
 zone "{{ reverse.0 }}.in-addr.arpa" {
 	type master;
-	file "/etc/bind/{{ reverse.0 }}.rev";
+	file "/etc/bind/hostbase/{{ reverse.0 }}.rev";
+	notify no;
+	also-notify { 140.221.9.6;140.221.8.10; };
 };{% endfor %}
 
 // zone "com" { type delegation-only; };
@@ -60,3 +66,4 @@ zone "{{ reverse.0 }}.in-addr.arpa" {
 // root-delegation-only exclude { "DE"; "MUSEUM"; };
 
 include "/etc/bind/named.conf.local";
+include "/etc/bind/named.conf.static";
\ No newline at end of file
diff --git a/src/lib/Server/Hostbase/templates/reverseappend.tmpl b/src/lib/Server/Hostbase/templates/reverseappend.tmpl
index d6d98981b..6ed520c98 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 %}{{ host.0.3 }}			PTR	{{ host.1.0 }}.{{ host.1.1 }}.
+{% for host in hosts %}{{ host.0.3 }}			PTR	{{ host.1 }}.
 {% endfor %}