Standardise on using bundle_config to configure bundler

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index eb13152fa3849cc13e93c8d86dd2566ab4fdfd21..b7d47e445f7ce87a143c1737aed18f7c1d5c0fcd 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


@@ -41,15 +42,20 @@ git "/srv/blogs.openstreetmap.org" do
   depth 1
   user "blogs"
   group "blogs"
   depth 1
   user "blogs"
   group "blogs"

-  notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately
+end
+
+bundle_config "/srv/blogs.openstreetmap.org" do
+  user "blogs"
+  group "blogs"
+  settings "deployment" => "true",
+           "without" => "development:test"

 end
 
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
 end
 
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing

-  options "--deployment"

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

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

 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do
 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do


@@ -57,6 +63,7 @@ bundle_exec "/srv/blogs.openstreetmap.org" do
   command "pluto build -t osm -o build"
   user "blogs"
   group "blogs"
   command "pluto build -t osm -o build"
   user "blogs"
   group "blogs"

+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 ssl_certificate "blogs.openstreetmap.org" do
 end
 
 ssl_certificate "blogs.openstreetmap.org" do


@@ -77,9 +84,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