Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[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 12c88a3a4e64bbe89053d65fb6a4e7efd14117b0..af2496deccbc36ce8bf3d67d8490e876641de9fd 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -5,25 +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 pdu1.openstreetmap.org {
+host pdu1.ams.openstreetmap.org {

   hardware ethernet 00:c0:b7:e3:e8:f2;
   hardware ethernet 00:c0:b7:e3:e8:f2;

-  server-name "pdu1.oob.openstreetmap.org";
-  fixed-address pdu1.oob.openstreetmap.org;
+  server-name "pdu1.ams.openstreetmap.org";
+  fixed-address pdu1.ams.openstreetmap.org;

 }
 
 }
 

-host pdu2.openstreetmap.org {
+host pdu2.ams.openstreetmap.org {

   hardware ethernet 00:c0:b7:e3:1b:9a;
   hardware ethernet 00:c0:b7:e3:1b:9a;

-  server-name "pdu2.oob.openstreetmap.org";
-  fixed-address pdu2.oob.openstreetmap.org;
+  server-name "pdu2.ams.openstreetmap.org";
+  fixed-address pdu2.ams.openstreetmap.org;

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


@@ -33,7 +34,7 @@ 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;
 }


@@ -63,7 +64,7 @@ host eustace.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;
 }


@@ -86,6 +87,12 @@ host noquiklos.oob.openstreetmap.org {
   fixed-address 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";
 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;
 }
 
   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";


@@ -111,11 +124,23 @@ 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";
 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;
 }
 
   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";


@@ -224,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;

 }
 }