Add authentication results header for email from external hosts

[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 e473a88865e32e40738abf070af9891777d4b155..af2496deccbc36ce8bf3d67d8490e876641de9fd 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] %> {
+  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 -%>
 
@@ -86,6 +87,12 @@ host 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";
@@ -104,6 +111,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";
@@ -116,6 +129,18 @@ host 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";
@@ -140,6 +165,30 @@ host 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";
@@ -224,8 +273,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;
 }