Use chef 14 to run tests

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 8389b6260ad7f76283a09b32675288f95194571e..3f9a8ca25062b4636953d433035ee808409478a4 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # 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,
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "git"
 
 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"
 
 
 gem_package "bundler"
 


@@ -39,7 +41,7 @@ git "/srv/blogs.openstreetmap.org" do
   repository "git://github.com/gravitystorm/blogs.osm.org.git"
   user "blogs"
   group "blogs"
   repository "git://github.com/gravitystorm/blogs.osm.org.git"
   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
 end
 
 execute "/srv/blogs.openstreetmap.org/Gemfile" do


@@ -48,25 +50,26 @@ execute "/srv/blogs.openstreetmap.org/Gemfile" do
   cwd "/srv/blogs.openstreetmap.org"
   user "root"
   group "root"
   cwd "/srv/blogs.openstreetmap.org"
   user "root"
   group "root"

-  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediate
+  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 /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