Use backport of cgi-mapserver

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 51e6b62f41f9634f4452a9bb4bfa0b6e44df263c..0fb2cc7aad06dc4739e903125d59de39ec871bdb 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -42,22 +42,24 @@ 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_install "/srv/blogs.openstreetmap.org" do
   action :nothing
 end
 
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing

-  options "--deployment"
-  user "root"
-  group "root"
-  notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately
+  options "--deployment --without development test"
+  environment "BUNDLE_PATH" => "vendor/bundle"
+  user "blogs"
+  group "blogs"
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do
   action :nothing
   command "pluto build -t osm -o build"
 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do
   action :nothing
   command "pluto build -t osm -o build"

+  environment "BUNDLE_PATH" => "vendor/bundle"

   user "blogs"
   group "blogs"
   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


@@ -78,11 +80,22 @@ 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
 end
 
 template "/etc/cron.daily/blogs-backup" do