Revert "Move AMS gateway to tabaluga"

[chef.git] / roles / taginfo.rb

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index ffafde6618f7f6db57c9338539a6a778e305b2bb..40bffdce2f48f91b0e45504523325a9e9712a081 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -8,8 +8,7 @@ default_attributes(
         :status => :administrator
       },
       :taginfo => {
         :status => :administrator
       },
       :taginfo => {

-        :status => :role,
-        :members => [ :jochen, :tomh ]
+        :members => [:jochen, :tomh]

       }
     }
   },
       }
     }
   },


@@ -17,19 +16,23 @@ default_attributes(
     :mpm => "event",
     :event => {
       :server_limit => 40,
     :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,
       :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
+  },

   :taginfo => {
     :sites => [
       {
         :name => "taginfo.openstreetmap.org",
   :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.",
         :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>",
+        :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>"
       }
         :icon => "world",
         :contact => "Jochen Topf <jochen@remote.org>"
       }