Add info message for taginfo.openstreetmap.org/about.

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index fcbbe05af9cec9ed0995ce2a6106012c28f7163f..27f560f3d78177984858e1c4b53345ca6c826117 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -72,6 +72,7 @@ node[:taginfo][:sites].each do |site|
   name = site[:name]
   directory = site[:directory] || "/srv/#{name}"
   description = site[:description]
   name = site[:name]
   directory = site[:directory] || "/srv/#{name}"
   description = site[:description]

+  about = site[:about]

   icon = site[:icon]
   contact = site[:contact]
 
   icon = site[:icon]
   contact = site[:contact]
 


@@ -107,6 +108,7 @@ node[:taginfo][:sites].each do |site|
 
   settings["instance"]["url"] = "http://#{name}/"
   settings["instance"]["description"] = description
 
   settings["instance"]["url"] = "http://#{name}/"
   settings["instance"]["description"] = description

+  settings["instance"]["about"] = about

   settings["instance"]["icon"] = "/img/logo/#{icon}.png"
   settings["instance"]["contact"] = contact
   settings["logging"]["directory"] = "/var/log/taginfo/#{name}"
   settings["instance"]["icon"] = "/img/logo/#{icon}.png"
   settings["instance"]["contact"] = contact
   settings["logging"]["directory"] = "/var/log/taginfo/#{name}"

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index a6496b23dce3f9df258104fdc2d562ad2d6f345c..ffafde6618f7f6db57c9338539a6a778e305b2bb 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -29,6 +29,7 @@ default_attributes(
       {
         :name => "taginfo.openstreetmap.org",
         :description => "This is the main taginfo site. It contains OSM data for the whole planet and is updated daily.",
       {
         :name => "taginfo.openstreetmap.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='http://www.osmfoundation.org/'>OSMF</a> and maintained by <a href='//www.openstreetmap.org/user/Jochen%20Topf'>Jochen Topf</a> and the <a href='//wiki.openstreetmap.org/wiki/System_Administrators'>Sysadmin team</a>.</p><p>There isn't just one taginfo site, there are several. The is the main site, but several <a class='extlink' href='//wiki.openstreetmap.org/wiki/Taginfo/Sites'>other taginfo sites</a> are operated by different people.</p>",

         :icon => "world",
         :contact => "Jochen Topf <jochen@remote.org>"
       }
         :icon => "world",
         :contact => "Jochen Topf <jochen@remote.org>"
       }