Don't expire connection limit sets

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 9d08b478bb104cf67e48dc133fb0621118ae24d1..e03973340433979d0c6e27dc793cb7d38f4287f2 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -31,6 +31,8 @@ package %w[
 ]
 
 apache_module "headers"
+apache_module "proxy"
+apache_module "proxy_fcgi"
 
 passwords = data_bag_item("donate", "passwords")
 
@@ -81,16 +83,32 @@ end
 php_fpm "donate.openstreetmap.org" do
   php_admin_values "open_basedir" => "/srv/donate.openstreetmap.org/:/usr/share/php/:/tmp/",
                    "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open"
+  prometheus_port 11101
 end
 
 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end
 
-cron_d "osmf-donate" do
-  minute "*/2"
+systemd_service "osmf-donate" do
+  description "Update donation list"
+  exec_start "/usr/bin/php /srv/donate.openstreetmap.org/scripts/update_csv_donate2016.php"
+  working_directory "/srv/donate.openstreetmap.org/scripts"
   user "donate"
-  command "cd /srv/donate.openstreetmap.org/scripts/; /usr/bin/php /srv/donate.openstreetmap.org/scripts/update_csv_donate2016.php"
+  sandbox true
+  memory_deny_write_execute true
+  restrict_address_families "AF_UNIX"
+  read_write_paths "/srv/donate.openstreetmap.org/data"
+end
+
+systemd_timer "osmf-donate" do
+  description "Update donation list"
+  on_boot_sec "2m"
+  on_unit_inactive_sec "2m"
+end
+
+service "osmf-donate.timer" do
+  action [:enable, :start]
 end
 
 template "/etc/cron.daily/osmf-donate-backup" do