djbdns/templates/default/dnscache-servers.erb djbdns/templates/default/sv-public-dnscache-log-run.erb djbdns/templates/default/sv-public-dnscache-run.erb @@ -10,3 +10,4 @@ Contributors and Copyright holders: * Copyright 2008-2009, Adam Jacob <adam@opscode.com> * Copyright 2008-2009, Joshua Timberman <joshua@opscode.com> * Copyright 2009, Joe Williams <joe@joetify.com> + * Copyright 2009, Joshua Sierles <joshua@37signals.com> \ No newline at end of file NOTICE @@ -2,6 +2,7 @@ # Cookbook Name:: djbdns # Recipe:: default # Author:: Joshua Timberman (<joshua@opscode.com>) +# Author:: Joshua Sierles (<joshua@37signals.com>) # # Copyright 2009, Opscode, Inc # @@ -24,6 +25,9 @@ djbdns[:tinydns_internal_ipaddress] = "127.0.0.1" unless djbdns.has_key?(:tinydn djbdns[:axfrdns_ipaddress] = "127.0.0.1" unless djbdns.has_key?(:axfrdns_ipaddress) djbdns[:public_dnscache_ipaddress] = ipaddress unless djbdns.has_key?(:public_dnscache_ipaddress) +djbdns[:public_dnscache_allowed_networks] = [ipaddress.split(".")[0,2].join(".")] unless djbdns.has_key?(:public_dnscache_allowed_networks) +djbdns[:tinydns_internal_resolved_domain] = domain unless djbdns.has_key?(:tinydns_internal_resolved_domain) + case lsb[:codename] when "intrepid" djbdns[:bin_dir] = "/usr/bin" djbdns/attributes/djbdns.rb @@ -1,5 +1,6 @@ # # Author:: Joshua Timberman (<joshua@opscode.com>) +# Author:: Joshua Sierles (<joshua@37signals.com>) # Cookbook Name:: djbdns # Recipe:: cache # @@ -20,30 +21,23 @@ include_recipe "djbdns" execute "public_cache_update" do - cwd "/etc/public-dnscache" + cwd "#{node[:runit_sv_dir]}/public-dnscache" command "#{node[:djbdns][:bin_dir]}/dnsip `#{node[:djbdns][:bin_dir]}/dnsqr ns . | awk '/answer:/ { print \$5 ; }' | sort` > root/servers/@" action :nothing end -execute "#{node[:djbdns][:bin_dir]}/dnscache-conf dnscache dnslog /etc/public-dnscache #{node[:djbdns][:public_dnscache_ipaddress]}" do - only_if "/usr/bin/test ! -d /etc/public-dnscache" +execute "#{node[:djbdns][:bin_dir]}/dnscache-conf dnscache dnslog #{node[:runit_sv_dir]}/public-dnscache #{node[:djbdns][:public_dnscache_ipaddress]}" do + only_if "/usr/bin/test ! -d #{node[:runit_sv_dir]}/public-dnscache" notifies :run, resources("execute[public_cache_update]") end -template "/etc/public-dnscache/run" do - source "sv-cache-run.erb" - mode 0755 -end - -template "/etc/public-dnscache/log/run" do - source "sv-cache-log-run.erb" - mode 0755 -end +runit_service "public-dnscache" -link "#{node[:runit_service_dir]}/public-dnscache" do - to "/etc/public-dnscache" +file "#{node[:runit_sv_dir]}/public-dnscache/root/ip/#{node[:djbdns][:public_dnscache_allowed_networks]}" do + mode 0644 end -link "/etc/init.d/public-dnscache" do - to node[:runit_sv_bin] +template "#{node[:runit_sv_dir]}/public-dnscache/root/servers/#{node[:djbdns][:tinydns_internal_resolved_domain]}" do + source "dnscache-servers.erb" + mode 0644 end djbdns/recipes/cache.rb djbdns/templates/default/sv-cache-log-run.erb djbdns/templates/default/sv-cache-run.erb d0d19233a74eca51b7e47559d0e106f748601399 jtimberman joshua@opscode.com http://github.com/dbgrandi/cookbooks/commit/654e15f102f2a958af4a609a8ed0571af124304d 654e15f102f2a958af4a609a8ed0571af124304d 2009-03-19T12:10:12-07:00 2009-03-18T15:22:07-07:00 COOK-8, public-dnscache updates, runit service etc Change public-dnscache to be a runit service. Add Joshua Sierles to author list and NOTICE. * Add attributes for resolved domain, allowed networks 5ded971538d23e31a23d5b0457bbe399db8994f9 jtimberman joshua@opscode.com