Add test for planet::current recipe

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index da3b0da61cf8322051d92acbd8a71b93cbf8d7dd..5cd260d1f16dd376138d4fd9a0c4db9c6c37ab15 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: blogs
+# Cookbook:: blogs

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "git"
 
 include_recipe "apache"
 include_recipe "git"
 


@@ -25,10 +26,13 @@ package %w[
   ruby-dev
   make
   gcc
   ruby-dev
   make
   gcc

+  g++

   libsqlite3-dev
 ]
 
   libsqlite3-dev
 ]
 

-gem_package "bundler"
+gem_package "bundler" do
+  version "~> 1.17.2"
+end

 
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
 
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"


@@ -38,24 +42,25 @@ end
 
 git "/srv/blogs.openstreetmap.org" do
   action :sync
 
 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"
   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
 end
 
 execute "/srv/blogs.openstreetmap.org/Gemfile" do
   action :nothing

-  command "bundle install"
+  command "bundle install --deployment"

   cwd "/srv/blogs.openstreetmap.org"
   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
 end
 
 execute "/srv/blogs.openstreetmap.org" do
   action :nothing

-  command "/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"
   cwd "/srv/blogs.openstreetmap.org"
   user "blogs"
   group "blogs"