Commit 19e75f06 authored by Leigh Stoller's avatar Leigh Stoller

Changes for geni racks; add also-notify config to named.conf.

parent 15eea316
...@@ -799,6 +799,7 @@ DHCPD_DYNRANGE ...@@ -799,6 +799,7 @@ DHCPD_DYNRANGE
DHCPD_EXTRAIFS DHCPD_EXTRAIFS
DHCPD_CONTROLNET_DECL DHCPD_CONTROLNET_DECL
NAMED_FORWARDERS NAMED_FORWARDERS
NAMED_ALSONOTIFY
SSLCERT_COUNTRY SSLCERT_COUNTRY
SSLCERT_STATE SSLCERT_STATE
SSLCERT_LOCALITY SSLCERT_LOCALITY
......
...@@ -214,6 +214,7 @@ AC_SUBST(DHCPD_DYNRANGE) ...@@ -214,6 +214,7 @@ AC_SUBST(DHCPD_DYNRANGE)
AC_SUBST(DHCPD_EXTRAIFS) AC_SUBST(DHCPD_EXTRAIFS)
AC_SUBST(DHCPD_CONTROLNET_DECL) AC_SUBST(DHCPD_CONTROLNET_DECL)
AC_SUBST(NAMED_FORWARDERS) AC_SUBST(NAMED_FORWARDERS)
AC_SUBST(NAMED_ALSONOTIFY)
AC_SUBST(SSLCERT_COUNTRY) AC_SUBST(SSLCERT_COUNTRY)
AC_SUBST(SSLCERT_STATE) AC_SUBST(SSLCERT_STATE)
AC_SUBST(SSLCERT_LOCALITY) AC_SUBST(SSLCERT_LOCALITY)
......
...@@ -88,6 +88,7 @@ PUBLIC_ROUTER=changeme ...@@ -88,6 +88,7 @@ PUBLIC_ROUTER=changeme
PUBLIC_NETMASK=changeme PUBLIC_NETMASK=changeme
DHCPD_DYNRANGE=changeme DHCPD_DYNRANGE=changeme
NAMED_FORWARDERS=changeme NAMED_FORWARDERS=changeme
NAMED_ALSONOTIFY=changeme
# #
# Must localize to avoid conflict with outer emulab frisbeed. # Must localize to avoid conflict with outer emulab frisbeed.
# #
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
options { options {
directory "/etc/namedb"; directory "/etc/namedb";
%forwarders% %forwarders%
%alsonotify%
}; };
view "internal" { view "internal" {
......
...@@ -60,6 +60,7 @@ my $PUBLIC_NETMASK = "@PUBLIC_NETMASK@"; ...@@ -60,6 +60,7 @@ my $PUBLIC_NETMASK = "@PUBLIC_NETMASK@";
my $NAMED_FORWARDERS = "@NAMED_FORWARDERS@"; my $NAMED_FORWARDERS = "@NAMED_FORWARDERS@";
my $VIRTNODE_NETWORK = "@VIRTNODE_NETWORK@"; my $VIRTNODE_NETWORK = "@VIRTNODE_NETWORK@";
my $VIRTNODE_NETMASK = "@VIRTNODE_NETMASK@"; my $VIRTNODE_NETMASK = "@VIRTNODE_NETMASK@";
my $NAMED_ALSONOTIFY = "@NAMED_ALSONOTIFY@";
# Testbed libraries. # Testbed libraries.
use lib "@prefix@/lib"; use lib "@prefix@/lib";
...@@ -159,6 +160,18 @@ while (<IF>) { ...@@ -159,6 +160,18 @@ while (<IF>) {
print $1 . "};\n"; print $1 . "};\n";
} }
} }
elsif ($2 eq "alsonotify") {
if ($NAMED_ALSONOTIFY eq "") {
print "";
}
else {
print $1 . "also-notify {\n";
foreach my $notify (split(" ", $NAMED_ALSONOTIFY)) {
print $1 . $1 . "$notify;\n";
}
print $1 . "};\n";
}
}
elsif ($2 eq "internal_network_reverse_zones") { elsif ($2 eq "internal_network_reverse_zones") {
for (my $i = $ic; $i <= $ic + (255 - $imc); $i++) { for (my $i = $ic; $i <= $ic + (255 - $imc); $i++) {
my $dotted = "${ia}.${ib}.${i}"; my $dotted = "${ia}.${ib}.${i}";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment