Merge remote-tracking branch 'github/pull/527'

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

diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb
index af178e28f9067e94403a521911294999eb749ecf..4304ce006a8ef792aa365dd76d3bdbc4eb0393dc 100644 (file)
--- a/cookbooks/dhcpd/recipes/default.rb
+++ b/cookbooks/dhcpd/recipes/default.rb
@@ -29,7 +29,7 @@ service "tftpd-hpa" do
   supports :status => true, :restart => true
 end
 
-remote_file "/var/lib/tftpboot/netboot.xyz.efi" do
+remote_file "/srv/tftp/netboot.xyz.efi" do
   action :create
   source "https://boot.netboot.xyz/ipxe/netboot.xyz.efi"
   owner "root"
@@ -37,7 +37,7 @@ remote_file "/var/lib/tftpboot/netboot.xyz.efi" do
   mode "644"
 end
 
-remote_file "/var/lib/tftpboot/netboot.xyz.kpxe" do
+remote_file "/srv/tftp/netboot.xyz.kpxe" do
   action :create
   source "https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe"
   owner "root"
@@ -60,3 +60,7 @@ service "isc-dhcp-server" do
   supports :status => true, :restart => true
   subscribes :restart, "template[/etc/dhcp/dhcpd.conf]"
 end
+
+service "isc-dhcp-server6" do
+  action [:disable, :stop]
+end