"Merge" from running copy on fortran.

[nms] / config / make-dhcpd.pl

diff --git a/config/make-dhcpd.pl b/config/make-dhcpd.pl
index e81d1d808ee8820ed32ef563e089d671c942e040..b31820d1a9fa43cb491a6796eaeb742c4ca28751 100755 (executable)
--- a/config/make-dhcpd.pl
+++ b/config/make-dhcpd.pl
@@ -40,9 +40,10 @@ if exists agent.circuit-id
        );
 }
 
+# dnssec-keygen -a HMAC-MD5 -b 128 -n HOST DHCP_UPDATER
 key DHCP_UPDATER {
         algorithm HMAC-MD5.SIG-ALG.REG.INT;
-       secret removed;
+       secret 5Yz1azvh7mE0IRGffTvtKg==;
 }
 
 default-lease-time 14400;
@@ -121,8 +122,8 @@ EOF
        pool {
                allow members of "$d";
                range $rangestart $rangeend;
-               option domain-name "$d.tg06.gathering.org";
-               ddns-domainname "$.tg06.gathering.org";
+               option domain-name "$d.tg06.gathering.org tg06.gathering.org";
+               ddns-domainname "$d.tg06.gathering.org";
                ignore client-updates;
        }
 EOF
@@ -139,20 +140,21 @@ subnet 194.0.$net netmask $netmask {
        option routers $gw;
 
        range $rangestart $rangeend;
-       option domain-name "$domain.tg06.gathering.org";
+       option domain-name "$domain.tg06.gathering.org tg06.gathering.org";
        ddns-domainname "$domain.tg06.gathering.org";
        ignore client-updates;
 EOF
 
-       # hack for sesse =)
-#      if ($net eq '250.0') {
-#              print <<"EOF";
-#      host trofast {
-#              hardware ethernet 00:0e:0c:36:a7:66;
-#              filename "/pxelinux.0";
-#              next-server 194.0.254.89;
-#      }
-#EOF
+               # hack for sesse =)
+               if ($net eq '250.0') {
+                       print <<"EOF";
+       host trofast {
+               hardware ethernet 00:0e:0c:36:a7:66;
+               filename "/pxelinux.0";
+               next-server 194.0.255.25;
+       }
+EOF
+               }
        }
        
        print "}\n";