nominatim: remove extra listen options in nginx config

[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 19156de668c2adb72c33ece0305c2ca00a29bd22..5274f9b3bda0cdb3b364676d0df04f730305e8e7 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -1,5 +1,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+option architecture-type code 93 = unsigned integer 16;
+
 default-lease-time 600;
 max-lease-time 7200;
 <% node.interfaces(:role => :internal).each do |interface| -%>
@@ -12,6 +14,17 @@ subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> {
   option domain-name "<%= @domain %>";
   option domain-name-servers <%= interface[:gateway] %>;
   option ntp-servers <%= node[:ntp][:servers].first %>;
+
+  class "pxeclients" {
+    match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
+    next-server <%= interface[:gateway] %>;
+
+    if option architecture-type = 00:07 {
+      filename "netboot.xyz.efi";
+    } else {
+      filename "netboot.xyz.kpxe";
+    }
+  }
 }
 <% end -%>
 
@@ -45,6 +58,12 @@ host 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 9c:8e:99:25:99:7d;
   server-name "draco.oob.openstreetmap.org";
@@ -81,42 +100,96 @@ host 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 98:4b:e1:6d:77:85;
   server-name "grindtooth.oob.openstreetmap.org";
   fixed-address grindtooth.oob.openstreetmap.org;
 }
 
+host horntail.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:82:ac:d2;
+  server-name "horntail.oob.openstreetmap.org";
+  fixed-address horntail.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 longma.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:2f:6d:4e;
+  server-name "longma.oob.openstreetmap.org";
+  fixed-address longma.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 norbert.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:82:ac:cf;
+  server-name "norbert.oob.openstreetmap.org";
+  fixed-address norbert.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";
@@ -165,6 +238,12 @@ host snap-02.oob.openstreetmap.org {
   fixed-address snap-02.oob.openstreetmap.org;
 }
 
+host snap-03.oob.openstreetmap.org {
+  hardware ethernet 3c:ec:ef:82:ab:f2;
+  server-name "snap-03.oob.openstreetmap.org";
+  fixed-address snap-03.oob.openstreetmap.org;
+}
+
 host smaug.oob.openstreetmap.org {
   hardware ethernet 00:30:48:9d:57:ff;
   server-name "smaug.oob.openstreetmap.org";
@@ -184,7 +263,7 @@ host 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;
 }