tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed munin log paths and permissions for EPEL packages

Browse source
This commit is contained in:
Ossi Salmi 2013-01-14 12:49:25 +02:00
parent ddef081721
commit 864ca3a897
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
munin/manifests/init.pp
View file

@ -249,12 +249,11 @@ class munin::server {
require => File["/var/cache/munin"], require => File["/var/cache/munin"],
} }
file { [ "/var/log/munin/munin-cgi-graph.log", file { "/var/log/munin":
"/var/log/munin/munin-cgi-html.log", ]: ensure => directory,
ensure => present, mode => "0775",
mode => "0664", owner => $apache::sslserver::user,
owner => "munin", group => "munin",
group => $apache::sslserver::group,
require => Package["munin"], require => Package["munin"],
} }
file { "/etc/logrotate.d/munin-cgi": file { "/etc/logrotate.d/munin-cgi":

11
munin/templates/munin-node.conf.erb
View file

@ -3,11 +3,15 @@
# #
log_level 4 log_level 4
<% if ['CentOS','Fedora','RedHat'].index(operatingsystem) -%>
log_file /var/log/munin-node/munin-node.log
<% else -%>
log_file /var/log/munin/munin-node.log log_file /var/log/munin/munin-node.log
<% end -%>
pid_file /var/run/munin/munin-node.pid pid_file /var/run/munin/munin-node.pid
background 1 background 1
setseid 1 setsid 1
user root user root
<% if operatingsystem == "OpenBSD" -%> <% if operatingsystem == "OpenBSD" -%>
@ -15,10 +19,8 @@ group wheel
<% else -%> <% else -%>
group root group root
<% end -%> <% end -%>
setsid yes
# Regexps for files to ignore # Regexps for files to ignore
ignore_file ~$ ignore_file ~$
ignore_file \.bak$ ignore_file \.bak$
ignore_file %$ ignore_file %$
@ -29,7 +31,6 @@ ignore_file \.pod$
# Set this if the client doesn't report the correct hostname when # Set this if the client doesn't report the correct hostname when
# telnetting to localhost, port 4949 # telnetting to localhost, port 4949
# #
#host_name ppc3.fedora.redhat.com
host_name <%= homename %> host_name <%= homename %>
# A list of addresses that are allowed to connect. This must be a # A list of addresses that are allowed to connect. This must be a
@ -41,8 +42,6 @@ allow <%= munin_allow %>
# Which address to bind to; # Which address to bind to;
host <%= ipaddress %> host <%= ipaddress %>
# host 127.0.0.1
# And which port # And which port
port 4949 port 4949