Merge branch 'master' into puppet3

2013-05-08 16:35:12 +03:00 · 2013-05-08 16:35:12 +03:00 · 17654bb71a
commit 17654bb71a
parent c8c5f097b4 e7aa487fc9
7 changed files with 50 additions and 48 deletions
--- a/puppet/templates/passenger-httpd.conf.erb
+++ b/puppet/templates/passenger-httpd.conf.erb
@ -47,6 +47,7 @@ Listen 8140
  PassengerGroup puppet
  PassengerHighPerformance On
  PassengerMaxRequests 1000
+  PassengerTempDir /var/run/passenger
  DocumentRoot /var/lib/passenger/puppet/public
  <Directory "/var/lib/passenger/puppet">
      Options None
--- a/puppet/templates/puppetmaster.conf.erb
+++ b/puppet/templates/puppetmaster.conf.erb
@ -5,10 +5,7 @@
 [puppetmasterd]
 <% end -%>
    # Enable reporting on server.
-    reports = tagmail,store,rrdgraph
-
-    rrdgraph = true
-    rrddir = /srv/puppet/rrd
+    reports = tagmail,store

    report = true
    reportdir = /srv/puppet/reports