From e9aae1dcf68e322a529fba527e2fe08fd0019ee2 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Tue, 28 Aug 2012 01:00:36 +0300 Subject: [PATCH] Removed munin_cgi_graph_jobs from munin.conf munin_cgi_graph_jobs doesn't actually do anything. Also changed from template to regular file. --- munin/{templates/munin.conf.erb => files/munin.conf} | 3 --- munin/manifests/init.pp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) rename munin/{templates/munin.conf.erb => files/munin.conf} (88%) diff --git a/munin/templates/munin.conf.erb b/munin/files/munin.conf similarity index 88% rename from munin/templates/munin.conf.erb rename to munin/files/munin.conf index 25264cd..9f615f9 100644 --- a/munin/templates/munin.conf.erb +++ b/munin/files/munin.conf @@ -15,8 +15,5 @@ html_strategy cgi graph_strategy cgi cgiurl_graph /munin/cgi/munin-cgi-graph -# Number of graph processes -munin_cgi_graph_jobs <%= processorcount %> - # Include nodes includedir /etc/munin/conf.d diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp index 4935ed3..7169237 100644 --- a/munin/manifests/init.pp +++ b/munin/manifests/init.pp @@ -298,10 +298,10 @@ class munin::server { file { "/etc/munin/munin.conf": ensure => present, - content => template("munin/munin.conf.erb"), owner => "root", group => "root", mode => "0644", + source => "puppet:///modules/munin/munin.conf", require => Package["munin"], }