nominatim: switch server to new location of nominatim

[chef.git] / cookbooks / web / recipes / cleanup.rb

diff --git a/cookbooks/web/recipes/cleanup.rb b/cookbooks/web/recipes/cleanup.rb
index 2b1039020f1ae0532a8a3a8ccc9703ff732f1f38..c1c47a0c4b88dbbed1e370efdaaafbe2c2a9cf44 100644 (file)
--- a/cookbooks/web/recipes/cleanup.rb
+++ b/cookbooks/web/recipes/cleanup.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: web
+# Cookbook:: web
 # Recipe:: cleanup
 #
-# 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
 #
-#     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,
@@ -19,13 +19,32 @@
 
 include_recipe "web::base"
 
-ruby = "ruby#{node[:passenger][: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 0755
-  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