Run pluto through bundler

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 6c0127ea20e82cd609b9d4fd56bca1fdb6353bba..ea0b3dc8f3ff6bc54e0f261bf8e34c7067bb7de6 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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,14 +17,16 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+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
+  libsqlite3-dev
+]
 
 gem_package "bundler"
 
@@ -53,21 +55,21 @@ end
 
 execute "/srv/blogs.openstreetmap.org" do
   action :nothing
-  command "/usr/local/bin/pluto build -t osm -o build"
+  command "bundle exec /usr/local/bin/pluto build -t osm -o build"
   cwd "/srv/blogs.openstreetmap.org"
   user "blogs"
   group "blogs"
 end
 
-ssl_certificate "blops.openstreetmap.org" do
-  domains "blogs.openstreetmap.org"
-  fallback_certificate "openstreetmap"
+ssl_certificate "blogs.openstreetmap.org" do
+  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