X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..86aeaefd2b815793d4bed90170428068e60f7c9f:/cookbooks/serverinfo/recipes/default.rb diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb index e68620f7b..4c46db5a0 100644 --- a/cookbooks/serverinfo/recipes/default.rb +++ b/cookbooks/serverinfo/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,7 +17,7 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "git" package "ruby" @@ -66,7 +66,13 @@ execute "/srv/hardware.openstreetmap.org" do group "nogroup" end +ssl_certificate "hardware.openstreetmap.org" do + domains ["hardware.openstreetmap.org", "hardware.osm.org"] + notifies :reload, "service[apache2]" +end + apache_site "hardware.openstreetmap.org" do template "apache.erb" directory "/srv/hardware.openstreetmap.org/_site" + variables :aliases => ["hardware.osm.org"] end