Avoid installing a private network default route on gateways

[chef.git] / cookbooks / dhcpd / templates / default / dhcpd.conf.erb

diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
index 96c6d02a6a55884fbf66cf0c35be87c1b95bddb5..c061548ee110c1dffb099c94bfaf5159166c528a 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -5,12 +5,13 @@ max-lease-time 7200;
 <% node.interfaces(:role => :internal).each do |interface| -%>
 
 subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> {
 <% node.interfaces(:role => :internal).each do |interface| -%>
 
 subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> {

+  authoritative;

   range dynamic-bootp <%= node[:dhcpd][:first_address] %> <%= node[:dhcpd][:last_address] %>;
   range dynamic-bootp <%= node[:dhcpd][:first_address] %> <%= node[:dhcpd][:last_address] %>;

-#  option broadcast-address <%= interface[:broadcast] %>;
+  # option broadcast-address <%= interface[:broadcast] %>;

   option routers <%= interface[:gateway] %>;
   option domain-name "<%= @domain %>";
   option domain-name-servers <%= interface[:gateway] %>;
   option routers <%= interface[:gateway] %>;
   option domain-name "<%= @domain %>";
   option domain-name-servers <%= interface[:gateway] %>;

-  option ntp-servers <%= node[:ntp][:servers].join(", ") %>;
+  option ntp-servers <%= node[:ntp][:servers].first %>;

 }
 <% end -%>
 
 }
 <% end -%>
 


@@ -62,6 +63,12 @@ host eustace.oob.openstreetmap.org {
   fixed-address eustace.oob.openstreetmap.org;
 }
 
   fixed-address eustace.oob.openstreetmap.org;
 }
 

+host fafnir.oob.openstreetmap.org {
+  hardware ethernet 38:63:bb:39:f0:96;
+  server-name "fafnir.oob.openstreetmap.org";
+  fixed-address fafnir.oob.openstreetmap.org;
+}
+

 host grindtooth.oob.openstreetmap.org {
   hardware ethernet 98:4b:e1:6d:77:85;
   server-name "grindtooth.oob.openstreetmap.org";
 host grindtooth.oob.openstreetmap.org {
   hardware ethernet 98:4b:e1:6d:77:85;
   server-name "grindtooth.oob.openstreetmap.org";


@@ -80,12 +87,24 @@ host karm.oob.openstreetmap.org {
   fixed-address karm.oob.openstreetmap.org;
 }
 
   fixed-address karm.oob.openstreetmap.org;
 }
 

+host lockheed.oob.openstreetmap.org {
+  hardware ethernet 44:1e:a1:57:8f:fe;
+  server-name "lockheed.oob.openstreetmap.org";
+  fixed-address lockheed.oob.openstreetmap.org;
+}
+

 host noquiklos.oob.openstreetmap.org {
   hardware ethernet 18:a9:05:70:b0:1e;
   server-name "noquiklos.oob.openstreetmap.org";
   fixed-address noquiklos.oob.openstreetmap.org;
 }
 
 host noquiklos.oob.openstreetmap.org {
   hardware ethernet 18:a9:05:70:b0:1e;
   server-name "noquiklos.oob.openstreetmap.org";
   fixed-address noquiklos.oob.openstreetmap.org;
 }
 

+host odin.oob.openstreetmap.org {
+  hardware ethernet ac:1f:6b:c0:59:a3;
+  server-name "odin.oob.openstreetmap.org";
+  fixed-address odin.oob.openstreetmap.org;
+}
+

 host orm.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:c5:26:80;
   server-name "orm.oob.openstreetmap.org";
 host orm.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:c5:26:80;
   server-name "orm.oob.openstreetmap.org";


@@ -122,6 +141,18 @@ host sarel.oob.openstreetmap.org {
   fixed-address sarel.oob.openstreetmap.org;
 }
 
   fixed-address sarel.oob.openstreetmap.org;
 }
 

+host snap-01.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:17:a6:72;
+  server-name "snap-01.oob.openstreetmap.org";
+  fixed-address snap-01.oob.openstreetmap.org;
+}
+
+host snap-02.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:17:a5:37;
+  server-name "snap-02.oob.openstreetmap.org";
+  fixed-address snap-02.oob.openstreetmap.org;
+}
+

 host smaug.oob.openstreetmap.org {
   hardware ethernet 00:30:48:9d:57:ff;
   server-name "smaug.oob.openstreetmap.org";
 host smaug.oob.openstreetmap.org {
   hardware ethernet 00:30:48:9d:57:ff;
   server-name "smaug.oob.openstreetmap.org";


@@ -129,13 +160,13 @@ host smaug.oob.openstreetmap.org {
 }
 
 host spike-01.oob.openstreetmap.org {
 }
 
 host spike-01.oob.openstreetmap.org {

-  hardware ethernet 1c:c1:de:e8:1a:1c;
+  hardware ethernet 3c:a8:2a:11:78:d6;

   server-name "spike-01.oob.openstreetmap.org";
   fixed-address spike-01.oob.openstreetmap.org;
 }
 
 host spike-02.oob.openstreetmap.org {
   server-name "spike-01.oob.openstreetmap.org";
   fixed-address spike-01.oob.openstreetmap.org;
 }
 
 host spike-02.oob.openstreetmap.org {

-  hardware ethernet 68:b5:99:af:d6:9c;
+  hardware ethernet 14:58:d0:5d:74:44;

   server-name "spike-02.oob.openstreetmap.org";
   fixed-address spike-02.oob.openstreetmap.org;
 }
   server-name "spike-02.oob.openstreetmap.org";
   fixed-address spike-02.oob.openstreetmap.org;
 }


@@ -163,7 +194,13 @@ host spike-08.oob.openstreetmap.org {
   server-name "spike-08.oob.openstreetmap.org";
   fixed-address spike-08.oob.openstreetmap.org;
 }
   server-name "spike-08.oob.openstreetmap.org";
   fixed-address spike-08.oob.openstreetmap.org;
 }

-        
+
+host tabaluga.oob.openstreetmap.org {
+  hardware ethernet 38:63:bb:39:82:7a;
+  server-name "tabaluga.oob.openstreetmap.org";
+  fixed-address tabaluga.oob.openstreetmap.org;
+}
+

 host tiamat-00.oob.openstreetmap.org {
   hardware ethernet 00:25:90:1a:76:01;
   server-name "tiamat-00.oob.openstreetmap.org";
 host tiamat-00.oob.openstreetmap.org {
   hardware ethernet 00:25:90:1a:76:01;
   server-name "tiamat-00.oob.openstreetmap.org";


@@ -224,12 +261,6 @@ host tiamat-23.oob.openstreetmap.org {
   fixed-address tiamat-23.oob.openstreetmap.org;
 }
 
   fixed-address tiamat-23.oob.openstreetmap.org;
 }
 

-host thorn-01.oob.openstreetmap.org {
-  hardware ethernet 44:1e:a1:57:8f:fe;
-  server-name "thorn-01.oob.openstreetmap.org";
-  fixed-address thorn-01.oob.openstreetmap.org;
-}
-

 host thorn-02.oob.openstreetmap.org {
   hardware ethernet e4:11:5b:ce:e8:aa;
   server-name "thorn-02.oob.openstreetmap.org";
 host thorn-02.oob.openstreetmap.org {
   hardware ethernet e4:11:5b:ce:e8:aa;
   server-name "thorn-02.oob.openstreetmap.org";


@@ -248,8 +279,8 @@ host urmel.oob.openstreetmap.org {
   fixed-address urmel.oob.openstreetmap.org;
 }
 
   fixed-address urmel.oob.openstreetmap.org;
 }
 

-host yevaud.oob.openstreetmap.org {
-  hardware ethernet 00:e0:81:c0:8d:02;
-  server-name "yevaud.oob.openstreetmap.org";
-  fixed-address yevaud.oob.openstreetmap.org;
+host ysera.oob.openstreetmap.org {
+  hardware ethernet ac:1f:6b:c1:40:2a;
+  server-name "ysera.oob.openstreetmap.org";
+  fixed-address ysera.oob.openstreetmap.org;

 }
 }