Switch blogs.openstreetmap.org to bundler 2.x

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index f37b4156f62b145c555287b718db1d23020e93e4..5af8f53a53ffd7a66ea19704d99dd2be9b15aabe 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -31,19 +31,19 @@ package %w[
 ]
 
 gem_package "bundler" do
-  version "~> 1.17.2"
+  version "~> 2.1.4"
 end
 
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/blogs.openstreetmap.org" do
   action :sync
-  repository "git://github.com/gravitystorm/blogs.osm.org.git"
-  depth 5
+  repository "https://github.com/gravitystorm/blogs.osm.org.git"
+  depth 1
   user "blogs"
   group "blogs"
   notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately
@@ -53,8 +53,8 @@ execute "/srv/blogs.openstreetmap.org/Gemfile" do
   action :nothing
   command "bundle install --deployment"
   cwd "/srv/blogs.openstreetmap.org"
-  user "root"
-  group "root"
+  user "blogs"
+  group "blogs"
   notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately
 end
 
@@ -77,9 +77,16 @@ apache_site "blogs.openstreetmap.org" do
   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 "0644"
+  mode "0755"
+end
+
+cron_d "blogs" do
+  minute "*/30"
+  user "blogs"
+  command "/usr/local/bin/blogs-update"
+  mailto "admins@openstreetmap.org"
 end