X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/11eb228156a5244b3f4484940728c514d64b22e6..a661370166bbac0bbe8c8b1f0ba947e3a269edee:/cookbooks/dns/recipes/default.rb diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb index d34858d9e..e2b41155d 100644 --- a/cookbooks/dns/recipes/default.rb +++ b/cookbooks/dns/recipes/default.rb @@ -30,25 +30,24 @@ package "libxml-writer-perl" package "libyaml-perl" package "libwww-perl" package "libjson-xs-perl" -package "liblwp-useragent-determined-perl" directory "/srv/dns.openstreetmap.org" do owner "root" group "root" - mode 0755 + mode 0o755 end remote_directory "/srv/dns.openstreetmap.org/html" do source "html" owner "root" group "root" - mode 0755 + mode 0o755 files_owner "root" files_group "root" - files_mode 0644 + files_mode 0o644 end -zones = Array.new +zones = [] Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile| zone = File.basename(kmlfile, ".json") @@ -57,7 +56,7 @@ Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile| source "zone.html.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :zone => zone end @@ -68,11 +67,11 @@ template "/srv/dns.openstreetmap.org/html/index.html" do source "index.html.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :zones => zones end -apache_site "dns.openstreetmap.org" do +apache_site "dns.openstreetmap.org" do template "apache.erb" directory "/srv/dns.openstreetmap.org" end @@ -81,7 +80,7 @@ template "/usr/local/bin/dns-update" do source "dns-update.erb" owner "root" group "git" - mode 0750 + mode 0o750 variables :passwords => passwords end @@ -95,22 +94,22 @@ end directory "/var/lib/dns" do owner "git" group "git" - mode 02775 - notifies :run, resources(:execute => "dns-update") + mode 0o2775 + notifies :run, "execute[dns-update]" end cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do source "post-receive" owner "git" group "git" - mode 0750 + mode 0o750 end template "/usr/local/bin/dns-check" do source "dns-check.erb" owner "root" group "git" - mode 0750 + mode 0o750 variables :passwords => passwords end @@ -118,5 +117,5 @@ template "/etc/cron.d/dns" do source "cron.erb" owner "root" group "root" - mode 0644 + mode 0o644 end