X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/643f28e4f32f013c16d04378d7d1f3dd7d8edc17..6b53a39192a887931550a01f9846fa7bdbd621e7:/cookbooks/blogs/recipes/default.rb

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 8389b6260..49e52cb57 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,16 +17,22 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "accounts"
+include_recipe "apache"
 include_recipe "git"
 
-package "ruby"
-package "ruby-dev"
-package "make"
-package "gcc"
-package "libsqlite3-dev"
+package %w[
+  ruby
+  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"
@@ -37,36 +43,38 @@ end
 git "/srv/blogs.openstreetmap.org" do
   action :sync
   repository "git://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 "/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"
 end
 
 ssl_certificate "blogs.openstreetmap.org" do
-  domains "blogs.openstreetmap.org"
+  domains ["blogs.openstreetmap.org", "blogs.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
 apache_site "blogs.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/blogs.openstreetmap.org/build"
+  variables :aliases => ["blogs.osm.org"]
 end
 
 template "/etc/cron.d/blogs" do