Use nice labels in layer switcher

[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 b7e74507fb57fa41a1bd8b4dc5e5bf870b98fecd..0e4c9653fb8eea3eef73e7dbb26aa742d27ce190 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -32,12 +32,24 @@ host apc3.<%= @domain %> {
   fixed-address 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 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 clifford.oob.openstreetmap.org {
+  hardware ethernet 00:1a:4b:a5:bd:2a;
+  server-name "clifford.oob.openstreetmap.org";
+  fixed-address clifford.oob.openstreetmap.org;
+}
+

 host draco.oob.openstreetmap.org {
   hardware ethernet 00:1c:c4:7a:da:dc;
   server-name "draco.oob.openstreetmap.org";
 host draco.oob.openstreetmap.org {
   hardware ethernet 00:1c:c4:7a:da:dc;
   server-name "draco.oob.openstreetmap.org";


@@ -51,7 +63,7 @@ host errol.oob.openstreetmap.org {
 }
 
 host eustace.oob.openstreetmap.org {
 }
 
 host eustace.oob.openstreetmap.org {

-  hardware ethernet 00:17:a4:3c:fb:9c;
+  hardware ethernet 1c:c1:de:71:4d:2e;

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


@@ -68,6 +80,12 @@ host fiddlestick.oob.openstreetmap.org {
   fixed-address fiddlestick.oob.openstreetmap.org;
 }
 
   fixed-address fiddlestick.oob.openstreetmap.org;
 }
 

+host grindtooth.oob.openstreetmap.org {
+  hardware ethernet 00:25:b3:a7:b7:9e;
+  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";
 host horntail.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:46:95:6e;
   server-name "horntail.oob.openstreetmap.org";


@@ -98,8 +116,14 @@ host poldi.oob.openstreetmap.org {
   fixed-address poldi.oob.openstreetmap.org;
 }
 
   fixed-address poldi.oob.openstreetmap.org;
 }
 

+host pummelzacken.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:cf:72:73;
+  server-name "pummelzacken.oob.openstreetmap.org";
+  fixed-address pummelzacken.oob.openstreetmap.org;
+}
+

 host ridley.oob.openstreetmap.org {
 host ridley.oob.openstreetmap.org {

-  hardware ethernet 00:17:a4:39:99:54;
+  hardware ethernet d4:85:64:52:2d:d8;

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


@@ -159,7 +183,7 @@ host thorn-03.oob.openstreetmap.org {
 }
 
 host urmel.oob.openstreetmap.org {
 }
 
 host urmel.oob.openstreetmap.org {

-  hardware ethernet 00:19:bb:39:1b:e6;
+  hardware ethernet 1c:c1:de:e7:4d:b2;

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