Merge remote-tracking branch 'github/pull/488'

[chef.git] / roles / planet.rb

diff --git a/roles/planet.rb b/roles/planet.rb
index d68bdabc3ac589e6c041bc9506308133bd6b2dfe..d7f349b4475b4b094bbf07df300a8fa63d3720f1 100644 (file)
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -2,15 +2,36 @@ name "planet"
 description "Role applied to all planet servers"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :bretth => { :status => :user },
-      :planet => {
-        :status => :administrator,
-        :members => [:bretth]
-      }
+  :apache => {
+    :mpm => "event",
+    :keepalive => true,
+    :event => {
+      :server_limit => 20,
+      :max_request_workers => 1000,
+      :threads_per_child => 50,
+      :min_spare_threads => 75,
+      :max_spare_threads => 525,
+      :listen_cores_buckets_ratio => 4
+    }
+  },
+  :networking => {
+    :firewall => {
+      :http_connection_limit => 10
     }
   },
+  :prometheus => {
+    :files => %w[
+      /store/planet/notes/planet-notes-latest.osn.bz2
+      /store/planet/pbf/planet-latest.osm.pbf
+      /store/planet/planet/changesets-latest.osm.bz2
+      /store/planet/planet/discussions-latest.osm.bz2
+      /store/planet/planet/planet-latest.osm.bz2
+      /store/planet/replication/changesets/state.yaml
+      /store/planet/replication/day/state.txt
+      /store/planet/replication/hour/state.txt
+      /store/planet/replication/minute/state.txt
+    ]
+  },
   :rsyncd => {
     :modules => {
       :planet => {
@@ -28,23 +49,25 @@ default_attributes(
         :ignore_nonreadable => true,
         :timeout => 3600,
         :refuse_options => ["checksum"]
+      },
+      :statistics => {
+        :comment => "Statistics",
+        :path => "/store/planet/statistics",
+        :read_only => false,
+        :write_only => true,
+        :list => false,
+        :uid => "planet",
+        :gid => "planet",
+        :transfer_logging => false,
+        :nodes_allow => "roles:web-statistics"
       }
     }
-  },
-  :apache => {
-    :mpm => "event",
-    :keepalive => true,
-    :event => {
-      :server_limit => 20,
-      :max_clients => 1000,
-      :threads_per_child => 50
-    }
   }
 )
 
 run_list(
+  "role[web-db]",
   "recipe[planet]",
   "recipe[planet::replication]",
-  "recipe[nfs::server]",
   "recipe[rsyncd]"
 )