Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/backup/recipes/default.rb b/cookbooks/backup/recipes/default.rb
index 27d12eb9bbf5cf2d634f30d7bfb55fece0b99315..a123a19ab8cb2e7b71dd3ad01fa9bc39e0480cfd 100644 (file)
--- a/cookbooks/backup/recipes/default.rb
+++ b/cookbooks/backup/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: backup
+# Cookbook:: backup

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

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

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

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,24 +17,29 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "perl"
-package "libdate-calc-perl"
+include_recipe "accounts"
+
+package %w[
+  perl
+  libdate-calc-perl
+]

 
 directory "/store/backup" do
   owner "osmbackup"
   group "osmbackup"
 
 directory "/store/backup" do
   owner "osmbackup"
   group "osmbackup"

-  mode 0o2755
+  mode "2755"
+  recursive true

 end
 
 cookbook_file "/usr/local/bin/expire-backups" do
   owner "root"
   group "root"
 end
 
 cookbook_file "/usr/local/bin/expire-backups" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/cron.daily/expire-backups" do
   source "expire.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/expire-backups" do
   source "expire.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 end