X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/19aeb7bfffb852ab8be005c004b1ef8e555a5b77..26cf6103779739532340c4838555985479e76de6:/cookbooks/blogs/recipes/default.rb diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index e67716638..ea0b3dc8f 100644 --- 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, @@ -55,20 +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 "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