Use new rake task to run database cleanups

diff --git a/cookbooks/web/recipes/cleanup.rb b/cookbooks/web/recipes/cleanup.rb
index 9ce886114de825b4595793e3d3d60c23d247b879..c1c47a0c4b88dbbed1e370efdaaafbe2c2a9cf44 100644 (file)
--- a/cookbooks/web/recipes/cleanup.rb
+++ b/cookbooks/web/recipes/cleanup.rb
@@ -19,13 +19,32 @@
 
 include_recipe "web::base"
 
-ruby = "ruby#{node[:ruby][:version]}"
+web_passwords = data_bag_item("web", "passwords")
+
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
-template "/etc/cron.daily/web-cleanup" do
-  source "cleanup.cron.erb"
-  owner "root"
-  group "root"
-  mode "755"
-  variables :ruby => ruby, :directory => rails_directory
+file "/etc/cron.daily/web-cleanup" do
+  action :delete
+end
+
+systemd_service "rails-cleanup" do
+  description "Rails cleanup"
+  type "simple"
+  environment "RAILS_ENV" => "production",
+              "SECRET_KEY_BASE" => web_passwords["secret_key_base"]
+  user "rails"
+  working_directory rails_directory
+  exec_start "#{node[:ruby][:bundle]} exec rails db:expire_tokens"
+  sandbox :enable_network => true
+  memory_deny_write_execute false
+  read_write_paths "/var/log/web"
+end
+
+systemd_timer "rails-cleanup" do
+  description "Rails cleanup"
+  on_calendar "02:00"
+end
+
+service "rails-cleanup.timer" do
+  action [:enable, :start]
 end

diff --git a/cookbooks/web/templates/default/cleanup.cron.erb b/cookbooks/web/templates/default/cleanup.cron.erb
deleted file mode 100644 (file)
index 390b5bc..0000000
--- a/cookbooks/web/templates/default/cleanup.cron.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-<%= @ruby %> <%= @directory %>/script/cleanup