Switch necrosan, nepomuk, noomoahk and norbert to squid 4

[chef.git] / roles / taginfo.rb

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 4b0fb23bd970fad04192ef3da565124106a7fc1f..9da56f28c2903015501474ff6079101bc25f0a49 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -17,19 +17,33 @@ default_attributes(
     :mpm => "event",
     :event => {
       :server_limit => 40,
-      :max_clients => 1000,
+      :max_request_workers => 1000,
       :min_spare_threads => 50,
       :max_spare_threads => 150,
       :threads_per_child => 50,
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
+    }
+  },
+  :passenger => {
+    :max_pool_size => 50
+  },
+  :planet => {
+    :current => {
+      :jobs => {
+        :taginfo => {
+          :command => "/usr/local/bin/taginfo-update",
+          :user => "taginfo"
+        }
+      }
     }
   },
   :taginfo => {
     :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='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>",
+        :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",
         :contact => "Jochen Topf <jochen@remote.org>"
       }
@@ -38,5 +52,6 @@ default_attributes(
 )
 
 run_list(
+  "role[planet-current]",
   "recipe[taginfo]"
 )