X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9cdb601941af4b17abb5aedb75cadbe7376773a3..e847b156af79e857466b8ca0f51d68ef69a6dd01:/cookbooks/blogs/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index da3b0da61..a3c8eebee 100644 --- a/cookbooks/blogs/recipes/default.rb +++ b/cookbooks/blogs/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: blogs +# Cookbook:: blogs # 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. @@ -17,46 +17,44 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" include_recipe "git" +include_recipe "ruby" -package %w[ - ruby - ruby-dev +package %W[ make gcc + g++ libsqlite3-dev ] -gem_package "bundler" - 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" + repository "https://github.com/gravitystorm/blogs.osm.org.git" + depth 1 user "blogs" group "blogs" - notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediate + notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately end -execute "/srv/blogs.openstreetmap.org/Gemfile" do +bundle_install "/srv/blogs.openstreetmap.org" do action :nothing - command "bundle install" - cwd "/srv/blogs.openstreetmap.org" + options "--deployment" user "root" group "root" - notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediate + notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately end -execute "/srv/blogs.openstreetmap.org" do +bundle_exec "/srv/blogs.openstreetmap.org" do 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 @@ -72,9 +70,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