Imagery: switch back to using multiwatch

[chef.git] / cookbooks / dhcpd / recipes / default.rb

diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb
index 0bdba6a32cf17d79b9da4ee5ceb01b0ba0c887ab..6075473e843ce9b8c634ad16d5b45ee7d49abc56 100644 (file)
--- a/cookbooks/dhcpd/recipes/default.rb
+++ b/cookbooks/dhcpd/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,28 +19,20 @@
 
 include_recipe "networking"
 
 
 include_recipe "networking"
 

-if node[:lsb][:release].to_f < 12.04
-  package_name = "dhcp3-server"
-  config_file = "/etc/dhcp3/dhcpd.conf"
-else
-  package_name = "isc-dhcp-server"
-  config_file = "/etc/dhcp/dhcpd.conf"
-end
-
-package package_name
+package "isc-dhcp-server"

 
 domain = "#{node[:networking][:roles][:external][:zone]}.openstreetmap.org"
 
 
 domain = "#{node[:networking][:roles][:external][:zone]}.openstreetmap.org"
 

-template config_file do
+template "/etc/dhcp/dhcpd.conf" do

   source "dhcpd.conf.erb"
   owner "root"
   group "root"
   source "dhcpd.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :domain => domain
 end
 
   variables :domain => domain
 end
 

-service package_name do
-  action [ :enable, :start ]
+service "isc-dhcp-server" do
+  action [:enable, :start]

   supports :status => true, :restart => true
   supports :status => true, :restart => true

-  subscribes :restart, resources(:template => config_file)
+  subscribes :restart, "template[/etc/dhcp/dhcpd.conf]"

 end
 end