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 d57fd109dda629de851fe0424b41a7b88d4391bf..af2496deccbc36ce8bf3d67d8490e876641de9fd 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -5,43 +5,26 @@ 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 -%>
 

-host apc1.<%= @domain %> {
-  hardware ethernet 00:c0:b7:77:f3:d8;
-  server-name "apc1.<%= @domain %>";
-  fixed-address apc1.<%= @domain %>;
+host pdu1.ams.openstreetmap.org {
+  hardware ethernet 00:c0:b7:e3:e8:f2;
+  server-name "pdu1.ams.openstreetmap.org";
+  fixed-address pdu1.ams.openstreetmap.org;

 }
 
 }
 

-host apc2.<%= @domain %> {
-  hardware ethernet 00:c0:b7:52:b7:d2;
-  server-name "apc2.<%= @domain %>";
-  fixed-address apc2.<%= @domain %>;
-}
-
-host apc3.<%= @domain %> {
-  hardware ethernet 00:c0:b7:52:b9:1e;
-  server-name "apc3.<%= @domain %>";
-  fixed-address apc3.<%= @domain %>;
-}
-
-host ascalon.oob.openstreetmap.org {
-  hardware ethernet 00:19:bb:39:3c:64;
-  server-name "ascalon.oob.openstreetmap.org";
-  fixed-address ascalon.oob.openstreetmap.org;
-}
-
-host bowser.oob.openstreetmap.org {
-  hardware ethernet 00:16:35:c5:dd:9e;
-  server-name "bowser.oob.openstreetmap.org";
-  fixed-address bowser.oob.openstreetmap.org;
+host pdu2.ams.openstreetmap.org {
+  hardware ethernet 00:c0:b7:e3:1b:9a;
+  server-name "pdu2.ams.openstreetmap.org";
+  fixed-address pdu2.ams.openstreetmap.org;

 }
 
 host clifford.oob.openstreetmap.org {
 }
 
 host clifford.oob.openstreetmap.org {


@@ -51,11 +34,17 @@ host clifford.oob.openstreetmap.org {
 }
 
 host draco.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;
 }
 
   server-name "draco.oob.openstreetmap.org";
   fixed-address draco.oob.openstreetmap.org;
 }
 

+host dulcy.oob.openstreetmap.org {
+  hardware ethernet 0c:c4:7a:66:ce:95;
+  server-name "dulcy.oob.openstreetmap.org";
+  fixed-address dulcy.oob.openstreetmap.org;
+}
+

 host eddie.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:d5:8c:c0;
   server-name "eddie.oob.openstreetmap.org";
 host eddie.oob.openstreetmap.org {
   hardware ethernet 0c:c4:7a:d5:8c:c0;
   server-name "eddie.oob.openstreetmap.org";


@@ -74,34 +63,22 @@ host eustace.oob.openstreetmap.org {
   fixed-address eustace.oob.openstreetmap.org;
 }
 
   fixed-address eustace.oob.openstreetmap.org;
 }
 

-host faffy.oob.openstreetmap.org {
-  hardware ethernet 00:17:a4:37:cc:d0;
-  server-name "faffy.oob.openstreetmap.org";
-  fixed-address faffy.oob.openstreetmap.org;
-}
-
-host fiddlestick.oob.openstreetmap.org {
-  hardware ethernet 00:17:a4:0f:22:c6;
-  server-name "fiddlestick.oob.openstreetmap.org";
-  fixed-address fiddlestick.oob.openstreetmap.org;
-}
-

 host grindtooth.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;
 }
 
   server-name "grindtooth.oob.openstreetmap.org";
   fixed-address grindtooth.oob.openstreetmap.org;
 }
 

-host horntail.oob.openstreetmap.org {
-  hardware ethernet 00:e0:81:46:95:6e;
-  server-name "horntail.oob.openstreetmap.org";
-  fixed-address horntail.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 idris.oob.openstreetmap.org {
-  hardware ethernet 00:1f:29:68:bd:b6;
-  server-name "idris.oob.openstreetmap.org";
-  fixed-address idris.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 noquiklos.oob.openstreetmap.org {
 }
 
 host noquiklos.oob.openstreetmap.org {


@@ -110,16 +87,22 @@ host noquiklos.oob.openstreetmap.org {
   fixed-address noquiklos.oob.openstreetmap.org;
 }
 
   fixed-address noquiklos.oob.openstreetmap.org;
 }
 

-host norbert.oob.openstreetmap.org {
-  hardware ethernet 00:1c:c4:7c:14:f6;
-  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 poldi.oob.openstreetmap.org {
-  hardware ethernet 00:e0:81:c5:2b:b7;
-  server-name "poldi.oob.openstreetmap.org";
-  fixed-address poldi.oob.openstreetmap.org;
+host orm.oob.openstreetmap.org {
+  hardware ethernet 00:e0:81:c5:26:80;
+  server-name "orm.oob.openstreetmap.org";
+  fixed-address orm.oob.openstreetmap.org;
+}
+
+host ouroboros.oob.openstreetmap.org {
+  hardware ethernet d4:85:64:4c:3d:00;
+  server-name "ouroboros.oob.openstreetmap.org";
+  fixed-address ouroboros.oob.openstreetmap.org;

 }
 
 host pummelzacken.oob.openstreetmap.org {
 }
 
 host pummelzacken.oob.openstreetmap.org {


@@ -128,6 +111,12 @@ host pummelzacken.oob.openstreetmap.org {
   fixed-address 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";
 host ridley.oob.openstreetmap.org {
   hardware ethernet d4:85:64:52:2d:d8;
   server-name "ridley.oob.openstreetmap.org";


@@ -135,41 +124,71 @@ host ridley.oob.openstreetmap.org {
 }
 
 host sarel.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;
 }
 
   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";
   fixed-address smaug.oob.openstreetmap.org;
 }
 
 host smaug.oob.openstreetmap.org {
   hardware ethernet 00:30:48:9d:57:ff;
   server-name "smaug.oob.openstreetmap.org";
   fixed-address smaug.oob.openstreetmap.org;
 }
 

-host soup.oob.openstreetmap.org {
-  hardware ethernet 00:17:a4:37:ec:88;
-  server-name "soup.oob.openstreetmap.org";
-  fixed-address soup.oob.openstreetmap.org;
-}
-

 host spike-01.oob.openstreetmap.org {
 host spike-01.oob.openstreetmap.org {

-  hardware ethernet 00:1a:4b:a5:bd:2a;
+  hardware ethernet 1c:c1:de:e8:1a:1c;

   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 00:1b:78:04:37:de;
+  hardware ethernet 68:b5:99:af:d6:9c;

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

-  hardware ethernet 00:19:bb:39:3c:64;
+  hardware ethernet 1c:c1:de:79:61:98;

   server-name "spike-03.oob.openstreetmap.org";
   fixed-address spike-03.oob.openstreetmap.org;
 }
 
   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";
 host tiamat-00.oob.openstreetmap.org {
   hardware ethernet 00:25:90:1a:76:01;
   server-name "tiamat-00.oob.openstreetmap.org";


@@ -231,19 +250,19 @@ host tiamat-23.oob.openstreetmap.org {
 }
 
 host thorn-01.oob.openstreetmap.org {
 }
 
 host thorn-01.oob.openstreetmap.org {

-  hardware ethernet 00:19:bb:35:87:94;
+  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 {
   server-name "thorn-01.oob.openstreetmap.org";
   fixed-address thorn-01.oob.openstreetmap.org;
 }
 
 host thorn-02.oob.openstreetmap.org {

-  hardware ethernet 00:19:bb:39:9b:a6;
+  hardware ethernet e4:11:5b:ce:e8:aa;

   server-name "thorn-02.oob.openstreetmap.org";
   fixed-address thorn-02.oob.openstreetmap.org;
 }
 
 host thorn-03.oob.openstreetmap.org {
   server-name "thorn-02.oob.openstreetmap.org";
   fixed-address thorn-02.oob.openstreetmap.org;
 }
 
 host thorn-03.oob.openstreetmap.org {

-  hardware ethernet 00:19:bb:37:f3:ce;
+  hardware ethernet 44:1e:a1:60:1f:92;

   server-name "thorn-03.oob.openstreetmap.org";
   fixed-address thorn-03.oob.openstreetmap.org;
 }
   server-name "thorn-03.oob.openstreetmap.org";
   fixed-address thorn-03.oob.openstreetmap.org;
 }


@@ -254,8 +273,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;

 }
 }