X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..204405570f4bf5e8a2b0400d000fc364e5e56f74:/cookbooks/blogs/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index d08fc482c..1d516a35a 100644 --- a/cookbooks/blogs/recipes/default.rb +++ b/cookbooks/blogs/recipes/default.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" include_recipe "git" @@ -25,10 +26,13 @@ package %w[ ruby-dev make gcc + g++ libsqlite3-dev ] -gem_package "bundler" +gem_package "bundler" do + version "~> 1.17.2" +end directory "/srv/blogs.openstreetmap.org" do owner "blogs" @@ -38,24 +42,25 @@ 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 5 user "blogs" group "blogs" - notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediate + notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately end execute "/srv/blogs.openstreetmap.org/Gemfile" do action :nothing - command "bundle install" + command "bundle install --deployment" cwd "/srv/blogs.openstreetmap.org" - user "root" - group "root" - notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediate + user "blogs" + group "blogs" + notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately end execute "/srv/blogs.openstreetmap.org" do action :nothing - command "bundle exec /usr/local/bin/pluto build -t osm -o build" + command "bundle exec pluto build -t osm -o build" cwd "/srv/blogs.openstreetmap.org" user "blogs" group "blogs"