Treat php-fpm as an upstart service on 14.04

[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 34988e62626fda1868805eb6afd9c3712be6990a..572a19ac7a70c3aae3bb25ad1090af1b57614da4 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -80,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:1b:78:04:37:de;
+  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";


@@ -110,6 +116,12 @@ 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 {
   hardware ethernet 00:17:a4:39:99:54;
   server-name "ridley.oob.openstreetmap.org";
 host ridley.oob.openstreetmap.org {
   hardware ethernet 00:17:a4:39:99:54;
   server-name "ridley.oob.openstreetmap.org";