mediawiki: add apache request duration logging

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index eb13152fa3849cc13e93c8d86dd2566ab4fdfd21..6b181f2090714e70b1d461e4f45d2e61cf24dc20 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -27,6 +27,7 @@ package %W[
   gcc
   g++
   libsqlite3-dev
   gcc
   g++
   libsqlite3-dev

+  sqlite3

 ]
 
 directory "/srv/blogs.openstreetmap.org" do
 ]
 
 directory "/srv/blogs.openstreetmap.org" do


@@ -47,8 +48,8 @@ end
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
   options "--deployment"
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
   options "--deployment"

-  user "blogs"
-  group "blogs"
+  user "root"
+  group "root"

   notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately
 end
 
   notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately
 end
 


@@ -77,9 +78,27 @@ template "/usr/local/bin/blogs-update" do
   mode "0755"
 end
 
   mode "0755"
 end
 

-cron_d "blogs" do
-  minute "*/30"
+systemd_service "blogs-update" do
+  description "Update blog aggregator"
+  exec_start "/usr/local/bin/blogs-update"

   user "blogs"
   user "blogs"

-  command "/usr/local/bin/blogs-update"
-  mailto "admins@openstreetmap.org"
+  sandbox :enable_network => true
+  read_write_paths "/srv/blogs.openstreetmap.org"
+end
+
+systemd_timer "blogs-update" do
+  description "Update blog aggregator"
+  on_boot_sec "15m"
+  on_unit_inactive_sec "30m"
+end
+
+service "blogs-update.timer" do
+  action [:enable, :start]
+end
+
+template "/etc/cron.daily/blogs-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode "0755"

 end
 end