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 a83740e17212ebe1d82a591a0013bf236f61c20f..ea0b3dc8f3ff6bc54e0f261bf8e34c7067bb7de6 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -55,20 +55,21 @@ end
 
 execute "/srv/blogs.openstreetmap.org" do
   action :nothing
 
 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 "blogs.openstreetmap.org" do
   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"
   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
 end
 
 template "/etc/cron.d/blogs" do