Switch web servers at Bytemark to ruby 2.3

[chef.git] / roles / taginfo.rb

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 2a273725f76b095b03edbce6db3a1538deee52aa..4b0fb23bd970fad04192ef3da565124106a7fc1f 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -9,16 +9,30 @@ default_attributes(
       },
       :taginfo => {
         :status => :role,
-        :members => [ :jochen, :tomh ]
+        :members => [:jochen, :tomh]
       }
     }
   },
-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
+  :apache => {
+    :mpm => "event",
+    :event => {
+      :server_limit => 40,
+      :max_clients => 1000,
+      :min_spare_threads => 50,
+      :max_spare_threads => 150,
+      :threads_per_child => 50,
+      :max_requests_per_child => 10000
+    }
   },
   :taginfo => {
     :sites => [
-      { :name => "taginfo.openstreetmap.org" }
+      {
+        :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>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",
+        :contact => "Jochen Topf <jochen@remote.org>"
+      }
     ]
   }
 )