diff --git a/site-cookbooks/backup/recipes/default.rb b/site-cookbooks/backup/recipes/default.rb index fa51649..b69c344 100644 --- a/site-cookbooks/backup/recipes/default.rb +++ b/site-cookbooks/backup/recipes/default.rb @@ -45,17 +45,23 @@ template "#{backup_dir}/config.rb" do mail_from: "backups@kosmos.org" end -if node["backup"]["default_model"] - template "#{backup_dir}/models/default.rb" do - source "backup.rb.erb" - mode 0640 - end +template "#{backup_dir}/models/default.rb" do + source "backup.rb.erb" + mode 0640 +end - cron "default backup model" do - hour node['backup']['cron']['hour'] - minute node['backup']['cron']['minute'] - command "/usr/bin/env HOME=/home/user PATH=/usr/local/bin:/usr/local/ruby/bin:/usr/bin:/bin:$PATH /bin/sh -l -c 'backup perform -t default --root-path #{backup_dir} >> /var/log/backup.log 2>&1'" - end +cron "default backup model" do + hour node['backup']['cron']['hour'] + minute node['backup']['cron']['minute'] + command "/usr/bin/env HOME=/root /bin/sh -l -c '/usr/local/bin/backup perform -t default --root-path #{backup_dir} >> /var/log/backup.log 2>&1'" +end + +include_recipe 'logrotate' +# Install MySQL client (includes mysqldump) +mysql_client 'default' do + action :create + not_if { node["backup"]["mysql"]["databases"].empty? } +end include_recipe 'logrotate' unless node["backup"]["mysql"]["databases"].empty?