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 1d3ef5bc538a9304aa7fd6d44a85f33437ee1e5e..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
 
 # 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| -%>
 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 %>;
   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 -%>
 
 }
 <% end -%>
 


@@ -87,12 +100,24 @@ host fafnir.oob.openstreetmap.org {
   fixed-address 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 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";
 host idris.oob.openstreetmap.org {
   hardware ethernet 94:57:a5:50:b5:a0;
   server-name "idris.oob.openstreetmap.org";


@@ -105,6 +130,12 @@ host ironbelly.oob.openstreetmap.org {
   fixed-address 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";
 host karm.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:67:cf:c4;
   server-name "karm.oob.openstreetmap.org";


@@ -123,6 +154,12 @@ host lockheed.oob.openstreetmap.org {
   fixed-address 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";
 host naga.oob.openstreetmap.org {
   hardware ethernet 94:57:a5:5f:11:f2;
   server-name "naga.oob.openstreetmap.org";


@@ -135,6 +172,12 @@ host noquiklos.oob.openstreetmap.org {
   fixed-address 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";
 host odin.oob.openstreetmap.org {
   hardware ethernet ac:1f:6b:c0:59:a3;
   server-name "odin.oob.openstreetmap.org";


@@ -195,6 +238,12 @@ host snap-02.oob.openstreetmap.org {
   fixed-address 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";
 host smaug.oob.openstreetmap.org {
   hardware ethernet 00:30:48:9d:57:ff;
   server-name "smaug.oob.openstreetmap.org";