#
-# Cookbook Name:: serverinfo
+# Cookbook:: serverinfo
# Recipe:: default
#
-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, 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
#
-# 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,
# limitations under the License.
#
-include_recipe "apache::ssl"
+include_recipe "apache"
include_recipe "git"
package "ruby"
end
ssl_certificate "hardware.openstreetmap.org" do
- domains "hardware.openstreetmap.org"
- fallback_certificate "openstreetmap"
+ 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