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

[chef.git] / roles / planet.rb

diff --git a/roles/planet.rb b/roles/planet.rb
index de8865e47ae0b19929fbd5eaa1c14c6bef28e1d2..4dd1f1d7476ec2cd3533c37280f0738f1427e129 100644 (file)
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -6,7 +6,7 @@ default_attributes(
     :mpm => "event",
     :keepalive => true,
     :event => {
-      :server_limit => 20,
+      :server_limit => 30,
       :max_request_workers => 1000,
       :threads_per_child => 50,
       :min_spare_threads => 75,
@@ -19,6 +19,19 @@ default_attributes(
       :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 => {
@@ -36,6 +49,17 @@ 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"
       }
     }
   }
@@ -45,6 +69,5 @@ run_list(
   "role[web-db]",
   "recipe[planet]",
   "recipe[planet::replication]",
-  "recipe[nfs::server]",
   "recipe[rsyncd]"
 )