Reduce WAL expiry to 14 days

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index d34858d9ecde567451d16259606fdb68d62f28ba..6c19048f20aa5d747a4f0813c74171a1669efa69 100644 (file)
--- 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 "libyaml-perl"
 package "libwww-perl"
 package "libjson-xs-perl"

-package "liblwp-useragent-determined-perl"

 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"
 
 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"
 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_owner "root"
   files_group "root"

-  files_mode 0644
+  files_mode 0o644

 end
 
 end
 

-zones = Array.new
+zones = []

 
 Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
   zone = File.basename(kmlfile, ".json")
 
 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"
     source "zone.html.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :zone => zone
   end
 
     variables :zone => zone
   end
 


@@ -68,11 +67,16 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
   source "index.html.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :zones => zones
 end
 
   variables :zones => zones
 end
 

-apache_site "dns.openstreetmap.org" do 
+ssl_certificate "dns.openstreetmap.org" do
+  domains "dns.openstreetmap.org"
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "dns.openstreetmap.org" do

   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
 end
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
 end


@@ -81,7 +85,7 @@ template "/usr/local/bin/dns-update" do
   source "dns-update.erb"
   owner "root"
   group "git"
   source "dns-update.erb"
   owner "root"
   group "git"

-  mode 0750
+  mode 0o750

   variables :passwords => passwords
 end
 
   variables :passwords => passwords
 end
 


@@ -95,22 +99,22 @@ end
 directory "/var/lib/dns" do
   owner "git"
   group "git"
 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"
 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"
 end
 
 template "/usr/local/bin/dns-check" do
   source "dns-check.erb"
   owner "root"
   group "git"

-  mode 0750
+  mode 0o750

   variables :passwords => passwords
 end
 
   variables :passwords => passwords
 end
 


@@ -118,5 +122,5 @@ template "/etc/cron.d/dns" do
   source "cron.erb"
   owner "root"
   group "root"
   source "cron.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 end