New origin for org.civicoop.emailapi

[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 e826c7efc0cb4c569091d9ba26ed8244efcec258..5544c3c599d529f607dcda59e690515c3846b52d 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -7,11 +7,11 @@ max-lease-time 7200;
 subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> {
   authoritative;
   range dynamic-bootp <%= node[:dhcpd][:first_address] %> <%= node[:dhcpd][:last_address] %>;
 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 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 -%>
 


@@ -81,6 +81,12 @@ host karm.oob.openstreetmap.org {
   fixed-address karm.oob.openstreetmap.org;
 }
 
   fixed-address karm.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 noquiklos.oob.openstreetmap.org {
   hardware ethernet 18:a9:05:70:b0:1e;
   server-name "noquiklos.oob.openstreetmap.org";
 host noquiklos.oob.openstreetmap.org {
   hardware ethernet 18:a9:05:70:b0:1e;
   server-name "noquiklos.oob.openstreetmap.org";


@@ -129,6 +135,18 @@ host sarel.oob.openstreetmap.org {
   fixed-address 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";


@@ -237,12 +255,6 @@ host tiamat-23.oob.openstreetmap.org {
   fixed-address tiamat-23.oob.openstreetmap.org;
 }
 
   fixed-address tiamat-23.oob.openstreetmap.org;
 }
 

-host thorn-01.oob.openstreetmap.org {
-  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 {
   hardware ethernet e4:11:5b:ce:e8:aa;
   server-name "thorn-02.oob.openstreetmap.org";
 host thorn-02.oob.openstreetmap.org {
   hardware ethernet e4:11:5b:ce:e8:aa;
   server-name "thorn-02.oob.openstreetmap.org";


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

 }
 }