-default[:osqa][:sites] = []
+default[:taginfo][:sites] = []
node[:taginfo][:sites].each do |site|
site_name = site[:name]
+ site_aliases = Array(site[:aliases])
directory = site[:directory] || "/srv/#{site_name}"
description = site[:description]
about = site[:about]
end
ssl_certificate site_name do
- domains site_name
+ domains [site_name] + site_aliases
notifies :reload, "service[apache2]"
end
apache_site site_name do
template "apache.erb"
directory "#{directory}/taginfo/web/public"
+ variables :aliases => site_aliases
end
end
Header setifempty Access-Control-Allow-Origin *
</Location>
</VirtualHost>
+<% unless @aliases.empty? -%>
+
+<VirtualHost *:443>
+ ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>
+ ServerAlias <%= alias_name %>
+<% end -%>
+ ServerAdmin webmaster@openstreetmap.org
+
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+ SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+ RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+<% end -%>
<VirtualHost *:80>
ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+ ServerAlias <%= alias_name %>
+<% end -%>
ServerAdmin webmaster@openstreetmap.org
CustomLog /var/log/apache2/<%= @name %>-access.log combined
:sites => [
{
:name => "taginfo.openstreetmap.org",
+ :aliases => ["taginfo.osm.org"],
:description => "This is the main taginfo site. It contains OSM data for the whole planet and is updated daily.",
:about => "<p>This site is run by the <a href='https://www.osmfoundation.org/'>OSMF</a> and maintained by <a href='https://www.openstreetmap.org/user/Jochen%20Topf'>Jochen Topf</a> and the <a href='https://wiki.openstreetmap.org/wiki/System_Administrators'>Sysadmin team</a>.</p><p>Several <a class='extlink' href='//wiki.openstreetmap.org/wiki/Taginfo/Sites'>other taginfo sites</a> are operated by different people for different areas of the world.</p>",
:icon => "world",