X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8a0ca3821816069cb36d6d101de0214f6d6abce0..97aac1724da5fd406b0be6c892f43a94e846e9b8:/cookbooks/dhcpd/recipes/default.rb?ds=inline

diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb
index af178e28f..0e6b9ec3f 100644
--- 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,15 @@ 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-snp.efi" do
+  action :create
+  source "https://boot.netboot.xyz/ipxe/netboot.xyz-snp.efi"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+remote_file "/srv/tftp/netboot.xyz.kpxe" do
   action :create
   source "https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe"
   owner "root"
@@ -55,8 +63,20 @@ template "/etc/dhcp/dhcpd.conf" do
   variables :domain => domain
 end
 
+template "/etc/default/isc-dhcp-server" do
+  source "default.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 service "isc-dhcp-server" do
   action [:enable, :start]
   supports :status => true, :restart => true
   subscribes :restart, "template[/etc/dhcp/dhcpd.conf]"
+  subscribes :restart, "template[/etc/default/isc-dhcp-server]"
+end
+
+service "isc-dhcp-server6" do
+  action [:disable, :stop]
 end