Add support for taginfo.osm.org

diff --git a/cookbooks/taginfo/attributes/default.rb b/cookbooks/taginfo/attributes/default.rb
index 487e6d37897acf14f176ac493c01d4a337189225..c7098b77b7b58f17aa1e44917b5fae47b68c0acb 100644 (file)
--- a/cookbooks/taginfo/attributes/default.rb
+++ b/cookbooks/taginfo/attributes/default.rb
@@ -1 +1 @@
-default[:osqa][:sites] = []
+default[:taginfo][:sites] = []

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 2fbbc96af99a398db11b4c1af870e10895122854..e6a4dadf7c3b970f4715f2248fa455c41aa98a86 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -85,6 +85,7 @@ end
 
 node[:taginfo][:sites].each do |site|
   site_name = site[:name]
 
 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]
   directory = site[:directory] || "/srv/#{site_name}"
   description = site[:description]
   about = site[:about]


@@ -238,12 +239,13 @@ node[:taginfo][:sites].each do |site|
   end
 
   ssl_certificate site_name do
   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"
     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory "#{directory}/taginfo/web/public"

+    variables :aliases => site_aliases

   end
 end
   end
 end

diff --git a/cookbooks/taginfo/templates/default/apache.erb b/cookbooks/taginfo/templates/default/apache.erb
index 3ae9fed71228623edd1191b0768484b51766bb27..82fef8b37f054941b214d90848ade923c61b4dbb 100644 (file)
--- a/cookbooks/taginfo/templates/default/apache.erb
+++ b/cookbooks/taginfo/templates/default/apache.erb
@@ -24,9 +24,31 @@
                 Header setifempty Access-Control-Allow-Origin *
         </Location>
 </VirtualHost>
                 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 %>
 
 <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
         ServerAdmin webmaster@openstreetmap.org
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 5697e2df5260cb2392fc472e2a09bd16a99125d1..d5ba812a907391ad41cac80e7deb08409acaf5bf 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -28,6 +28,7 @@ default_attributes(
     :sites => [
       {
         :name => "taginfo.openstreetmap.org",
     :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",
         :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",