Use backport of cgi-mapserver

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

diff --git a/cookbooks/dhcpd/recipes/default.rb b/cookbooks/dhcpd/recipes/default.rb
index 6075473e843ce9b8c634ad16d5b45ee7d49abc56..0e6b9ec3fcf35f330241105acb7fde1b1c98c100 100644 (file)
--- a/cookbooks/dhcpd/recipes/default.rb
+++ b/cookbooks/dhcpd/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: dhcpd
+# Cookbook:: dhcpd

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -19,7 +19,39 @@
 
 include_recipe "networking"
 
 
 include_recipe "networking"
 

-package "isc-dhcp-server"
+package %w[
+  isc-dhcp-server
+  tftpd-hpa
+]
+
+service "tftpd-hpa" do
+  action [:enable, :start]
+  supports :status => true, :restart => true
+end
+
+remote_file "/srv/tftp/netboot.xyz.efi" do
+  action :create
+  source "https://boot.netboot.xyz/ipxe/netboot.xyz.efi"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+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"
+  group "root"
+  mode "644"
+end

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


@@ -27,12 +59,24 @@ template "/etc/dhcp/dhcpd.conf" do
   source "dhcpd.conf.erb"
   owner "root"
   group "root"
   source "dhcpd.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :domain => domain
 end
 
   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]"
 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
 end