X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0f8f5c3977cebb6eb8ab6a1d5f3ee7b5d75116b7..653db5852f8e4e40f04ab7ce1a1da334f2c034f1:/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 81ffb748a..51cb46742 100644
--- 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] %> {
+  authoritative;
   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 ntp-servers <%= node[:ntp][:servers].join(", ") %>;
+  option ntp-servers <%= node[:ntp][:servers].first %>;
 }
 <% end -%>
 
@@ -26,14 +27,32 @@ host pdu2.ams.openstreetmap.org {
   fixed-address pdu2.ams.openstreetmap.org;
 }
 
+host pdu1.dub.openstreetmap.org {
+  hardware ethernet 28:29:86:48:f7:f5;
+  server-name "pdu1.dub.openstreetmap.org";
+  fixed-address pdu1.dub.openstreetmap.org;
+}
+
+host pdu2.dub.openstreetmap.org {
+  hardware ethernet 28:29:86:48:f8:64;
+  server-name "pdu2.dub.openstreetmap.org";
+  fixed-address pdu2.dub.openstreetmap.org;
+}
+
 host clifford.oob.openstreetmap.org {
   hardware ethernet 1c:c1:de:78:20:d6;
   server-name "clifford.oob.openstreetmap.org";
   fixed-address clifford.oob.openstreetmap.org;
 }
 
+host culebre.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:2f:29:41;
+  server-name "culebre.oob.openstreetmap.org";
+  fixed-address culebre.oob.openstreetmap.org;
+}
+
 host draco.oob.openstreetmap.org {
-  hardware ethernet 00:1c:c4:7a:da:dc;
+  hardware ethernet 9c:8e:99:25:99:7d;
   server-name "draco.oob.openstreetmap.org";
   fixed-address draco.oob.openstreetmap.org;
 }
@@ -62,30 +81,84 @@ host 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 gorwen.oob.openstreetmap.org {
+  hardware ethernet d8:9d:67:5f:bd:bc;
+  server-name "gorwen.oob.openstreetmap.org";
+  fixed-address gorwen.oob.openstreetmap.org;
+}
+
 host grindtooth.oob.openstreetmap.org {
-  hardware ethernet 00:25:b3:a7:b7:9e;
+  hardware ethernet 98:4b:e1:6d:77:85;
   server-name "grindtooth.oob.openstreetmap.org";
   fixed-address grindtooth.oob.openstreetmap.org;
 }
 
+host idris.oob.openstreetmap.org {
+  hardware ethernet 94:57:a5:50:b5:a0;
+  server-name "idris.oob.openstreetmap.org";
+  fixed-address idris.oob.openstreetmap.org;
+}
+
 host ironbelly.oob.openstreetmap.org {
   hardware ethernet 00:25:90:cd:14:84;
   server-name "ironbelly.oob.openstreetmap.org";
   fixed-address ironbelly.oob.openstreetmap.org;
 }
 
+host jakelong.oob.openstreetmap.org {
+  hardware ethernet d8:9d:67:66:02:9e;
+  server-name "jakelong.oob.openstreetmap.org";
+  fixed-address jakelong.oob.openstreetmap.org;
+}
+
 host karm.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:67:cf:c4;
   server-name "karm.oob.openstreetmap.org";
   fixed-address karm.oob.openstreetmap.org;
 }
 
+host konqi.oob.openstreetmap.org {
+  hardware ethernet ec:b1:d7:7a:ea:64;
+  server-name "konqi.oob.openstreetmap.org";
+  fixed-address konqi.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 naga.oob.openstreetmap.org {
+  hardware ethernet 94:57:a5:5f:11:f2;
+  server-name "naga.oob.openstreetmap.org";
+  fixed-address naga.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 oob1.dub.openstreetmap.org {
+  hardware ethernet dc:a6:32:ec:d4:ee;
+  server-name "oob1.dub.openstreetmap.org";
+  fixed-address oob1.dub.openstreetmap.org;
+}
+
 host orm.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:c5:26:80;
   server-name "orm.oob.openstreetmap.org";
@@ -104,6 +177,12 @@ host pummelzacken.oob.openstreetmap.org {
   fixed-address pummelzacken.oob.openstreetmap.org;
 }
 
+host ramoth.oob.openstreetmap.org {
+  hardware ethernet 0c:c4:7a:af:75:eb;
+  server-name "ramoth.oob.openstreetmap.org";
+  fixed-address ramoth.oob.openstreetmap.org;
+}
+
 host ridley.oob.openstreetmap.org {
   hardware ethernet d4:85:64:52:2d:d8;
   server-name "ridley.oob.openstreetmap.org";
@@ -111,11 +190,23 @@ host ridley.oob.openstreetmap.org {
 }
 
 host sarel.oob.openstreetmap.org {
-  hardware ethernet 00:1c:c4:7c:d2:be;
+  hardware ethernet e8:39:35:b0:ef:d5;
   server-name "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";
@@ -123,23 +214,47 @@ host smaug.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 {
-  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;
 }
 
 host spike-03.oob.openstreetmap.org {
-  hardware ethernet 1c:c1:de:79:61:98;
+  hardware ethernet 38:63:bb:3a:b0:ce;
   server-name "spike-03.oob.openstreetmap.org";
   fixed-address spike-03.oob.openstreetmap.org;
 }
 
+host spike-06.oob.openstreetmap.org {
+  hardware ethernet 38:63:bb:3a:41:a0;
+  server-name "spike-06.oob.openstreetmap.org";
+  fixed-address spike-06.oob.openstreetmap.org;
+}
+
+host spike-07.oob.openstreetmap.org {
+  hardware ethernet 14:02:ec:38:e9:52;
+  server-name "spike-07.oob.openstreetmap.org";
+  fixed-address spike-07.oob.openstreetmap.org;
+}
+
+host spike-08.oob.openstreetmap.org {
+  hardware ethernet 38:63:bb:3a:41:94;
+  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";
@@ -200,12 +315,6 @@ host 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";
@@ -224,8 +333,8 @@ host 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;
 }