X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6157bab7abeae44abae9b58f7358779a86ad6437..4b72a671e89f505b417a9ef47368187a17f4d252:/cookbooks/web/recipes/rails.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 848ac239d..7945d3d03 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -19,7 +19,6 @@
 
 include_recipe "tools"
 include_recipe "web::base"
-include_recipe "web::nfs"
 
 include_recipe "apache"
 include_recipe "passenger"
@@ -59,8 +58,6 @@ rails_port "www.openstreetmap.org" do
   email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
   status node[:web][:status]
   messages_domain "messages.openstreetmap.org"
-  quova_username "ws360602"
-  quova_password web_passwords["quova"]
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
@@ -102,18 +99,24 @@ template "/usr/local/bin/api-statistics" do
   mode 0o755
 end
 
-template "/etc/init.d/api-statistics" do
-  source "api-statistics.init.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+systemd_service "api-statistics" do
+  description "OpenStreetMap API Statistics Daemon"
+  user "rails"
+  group "adm"
+  exec_start "/usr/local/bin/api-statistics"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  restart "on-failure"
 end
 
 service "api-statistics" do
   action [:enable, :start]
   supports :restart => true
   subscribes :restart, "template[/usr/local/bin/api-statistics]"
-  subscribes :restart, "template[/etc/init.d/api-statistics]"
+  subscribes :restart, "systemd_service[api-statistics]"
 end
 
 gem_package "hpricot"