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 da3b0da61cf8322051d92acbd8a71b93cbf8d7dd..6b181f2090714e70b1d461e4f45d2e61cf24dc20 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: blogs
+# Cookbook:: blogs

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,46 +17,45 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "git"
 include_recipe "apache"
 include_recipe "git"

+include_recipe "ruby"

 
 

-package %w[
-  ruby
-  ruby-dev
+package %W[

   make
   gcc
   make
   gcc

+  g++

   libsqlite3-dev
   libsqlite3-dev

+  sqlite3

 ]
 
 ]
 

-gem_package "bundler"
-

 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"

-  mode 0o755
+  mode "755"

 end
 
 git "/srv/blogs.openstreetmap.org" do
   action :sync
 end
 
 git "/srv/blogs.openstreetmap.org" do
   action :sync

-  repository "git://github.com/gravitystorm/blogs.osm.org.git"
+  repository "https://github.com/gravitystorm/blogs.osm.org.git"
+  depth 1

   user "blogs"
   group "blogs"
   user "blogs"
   group "blogs"

-  notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediate
+  notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 end
 

-execute "/srv/blogs.openstreetmap.org/Gemfile" do
+bundle_install "/srv/blogs.openstreetmap.org" do

   action :nothing
   action :nothing

-  command "bundle install"
-  cwd "/srv/blogs.openstreetmap.org"
+  options "--deployment"

   user "root"
   group "root"
   user "root"
   group "root"

-  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediate
+  notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 end
 

-execute "/srv/blogs.openstreetmap.org" do
+bundle_exec "/srv/blogs.openstreetmap.org" do

   action :nothing
   action :nothing

-  command "/usr/local/bin/pluto build -t osm -o build"
-  cwd "/srv/blogs.openstreetmap.org"
+  command "pluto build -t osm -o build"

   user "blogs"
   group "blogs"
 end
   user "blogs"
   group "blogs"
 end


@@ -72,9 +71,34 @@ apache_site "blogs.openstreetmap.org" do
   variables :aliases => ["blogs.osm.org"]
 end
 
   variables :aliases => ["blogs.osm.org"]
 end
 

-template "/etc/cron.d/blogs" do
-  source "cron.erb"
+template "/usr/local/bin/blogs-update" do
+  source "blogs-update.erb"
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
+systemd_service "blogs-update" do
+  description "Update blog aggregator"
+  exec_start "/usr/local/bin/blogs-update"
+  user "blogs"
+  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"
   owner "root"
   group "root"

-  mode "0644"
+  mode "0755"

 end
 end