Fix new cookstyle warnings

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

diff --git a/cookbooks/letsencrypt/recipes/default.rb b/cookbooks/letsencrypt/recipes/default.rb
index a1df6819035b160a35a42580998811cdb8d3da6c..a327119bf195974a2764a22490e9219111ace6e3 100644 (file)
--- a/cookbooks/letsencrypt/recipes/default.rb
+++ b/cookbooks/letsencrypt/recipes/default.rb
@@ -30,31 +30,31 @@ package %w[
 directory "/etc/letsencrypt" do
   owner "letsencrypt"
   group "letsencrypt"
 directory "/etc/letsencrypt" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/letsencrypt" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/var/lib/letsencrypt" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o755
+  mode "755"

 end
 
 directory "/var/log/letsencrypt" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/var/log/letsencrypt" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o700
+  mode "700"

 end
 
 directory "/srv/acme.openstreetmap.org" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/srv/acme.openstreetmap.org" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o755
+  mode "755"

 end
 
 directory "/srv/acme.openstreetmap.org/html" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/srv/acme.openstreetmap.org/html" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o755
+  mode "755"

 end
 
 ssl_certificate "acme.openstreetmap.org" do
 end
 
 ssl_certificate "acme.openstreetmap.org" do


@@ -70,55 +70,55 @@ end
 directory "/srv/acme.openstreetmap.org/config" do
   owner "letsencrypt"
   group "letsencrypt"
 directory "/srv/acme.openstreetmap.org/config" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o755
+  mode "755"

 end
 
 directory "/srv/acme.openstreetmap.org/work" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/srv/acme.openstreetmap.org/work" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o755
+  mode "755"

 end
 
 directory "/srv/acme.openstreetmap.org/logs" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/srv/acme.openstreetmap.org/logs" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o700
+  mode "700"

 end
 
 directory "/srv/acme.openstreetmap.org/.chef" do
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 directory "/srv/acme.openstreetmap.org/.chef" do
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o2775
+  mode "2775"

 end
 
 file "/srv/acme.openstreetmap.org/.chef/client.pem" do
   content keys["letsencrypt"].join("\n")
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 file "/srv/acme.openstreetmap.org/.chef/client.pem" do
   content keys["letsencrypt"].join("\n")
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o660
+  mode "660"

 end
 
 cookbook_file "/srv/acme.openstreetmap.org/.chef/knife.rb" do
   source "knife.rb"
   owner "letsencrypt"
   group "letsencrypt"
 end
 
 cookbook_file "/srv/acme.openstreetmap.org/.chef/knife.rb" do
   source "knife.rb"
   owner "letsencrypt"
   group "letsencrypt"

-  mode 0o660
+  mode "660"

 end
 
 remote_directory "/srv/acme.openstreetmap.org/bin" do
   source "bin"
   owner "root"
   group "root"
 end
 
 remote_directory "/srv/acme.openstreetmap.org/bin" do
   source "bin"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 directory "/srv/acme.openstreetmap.org/requests" do
   owner "root"
   group "root"
 end
 
 directory "/srv/acme.openstreetmap.org/requests" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 certificates = search(:node, "letsencrypt:certificates").each_with_object({}) do |n, c|
 end
 
 certificates = search(:node, "letsencrypt:certificates").each_with_object({}) do |n, c|


@@ -137,7 +137,7 @@ certificates.each do |name, details|
     source "request.erb"
     owner "root"
     group "letsencrypt"
     source "request.erb"
     owner "root"
     group "letsencrypt"

-    mode 0o754
+    mode "754"

     variables details
   end
 
     variables details
   end
 


@@ -148,7 +148,7 @@ certificates.each do |name, details|
     user "letsencrypt"
     group "letsencrypt"
     subscribes :run, "template[/srv/acme.openstreetmap.org/requests/#{name}]"
     user "letsencrypt"
     group "letsencrypt"
     subscribes :run, "template[/srv/acme.openstreetmap.org/requests/#{name}]"

-    not_if { ENV["TEST_KITCHEN"] }
+    not_if { kitchen? }

   end
 end
 
   end
 end
 


@@ -171,13 +171,29 @@ template "/srv/acme.openstreetmap.org/bin/check-certificates" do
   source "check-certificates.erb"
   owner "root"
   group "root"
   source "check-certificates.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   variables :certificates => certificates
 end
 
   variables :certificates => certificates
 end
 

-template "/etc/cron.d/letsencrypt" do
-  source "cron.erb"
+cron_d "letencrypt-renew" do
+  minute "00"
+  hour "*/12"
+  user "letsencrypt"
+  command "/srv/acme.openstreetmap.org/bin/renew"
+  mailto "admins@openstreetmap.org"
+end
+
+cron_d "letencrypt-check" do
+  minute "30"
+  hour "*/12"
+  user "letsencrypt"
+  command "/srv/acme.openstreetmap.org/bin/check-certificates"
+  mailto "admins@openstreetmap.org"
+end
+
+template "/etc/logrotate.d/letsencrypt" do
+  source "logrotate.erb"

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 end