From 1893960c1babb6a261cc6fc399231e9c0644a104 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 29 Sep 2009 22:51:15 +0200 Subject: refactor everything into its own file --- manifests/host/cgi.pp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 manifests/host/cgi.pp (limited to 'manifests/host/cgi.pp') diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp new file mode 100644 index 0000000..7fdb281 --- /dev/null +++ b/manifests/host/cgi.pp @@ -0,0 +1,16 @@ +class munin::host::cgi { + exec{'set_modes_for_cgi': + command => 'chgrp apache /var/log/munin /var/log/munin/munin-graph.log && chmod g+w /var/log/munin /var/log/munin/munin-graph.log && find /var/www/html/munin/* -maxdepth 1 -type d -exec chgrp -R apache {} \; && find /var/www/html/munin/* -maxdepth 1 -type d -exec chmod -R g+w {} \;', + refreshonly => true, + subscribe => File['/etc/munin/munin.conf.header'], + } + + file{'/etc/logrotate.d/munin': + source => [ "puppet://$server/files/munin/config/host/${fqdn}/logrotate", + "puppet://$server/files/munin/config/host/logrotate.$operatingsystem", + "puppet://$server/files/munin/config/host/logrotate", + "puppet://$server/munin/config/host/logrotate.$operatingsystem", + "puppet://$server/munin/config/host/logrotate" ], + owner => root, group => 0, mode => 0644; + } +} -- cgit v1.2.3 From 36c07aa6cb615aad0cc5dd7d163221383d7ff9bb Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 2 Nov 2009 00:57:23 +0100 Subject: recursivly updating file path to new 0.25 style --- manifests/host/cgi.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/host/cgi.pp') diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp index 7fdb281..6896b22 100644 --- a/manifests/host/cgi.pp +++ b/manifests/host/cgi.pp @@ -9,8 +9,8 @@ class munin::host::cgi { source => [ "puppet://$server/files/munin/config/host/${fqdn}/logrotate", "puppet://$server/files/munin/config/host/logrotate.$operatingsystem", "puppet://$server/files/munin/config/host/logrotate", - "puppet://$server/munin/config/host/logrotate.$operatingsystem", - "puppet://$server/munin/config/host/logrotate" ], + "puppet://$server/modules/munin/config/host/logrotate.$operatingsystem", + "puppet://$server/modules/munin/config/host/logrotate" ], owner => root, group => 0, mode => 0644; } } -- cgit v1.2.3 From 53f373c61b0452488cdfb1d2779364e7865011ca Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 14 Nov 2009 13:15:30 +0100 Subject: update file paths to 0.25.x style --- manifests/host/cgi.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/host/cgi.pp') diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp index 6896b22..aeb0cdf 100644 --- a/manifests/host/cgi.pp +++ b/manifests/host/cgi.pp @@ -6,9 +6,9 @@ class munin::host::cgi { } file{'/etc/logrotate.d/munin': - source => [ "puppet://$server/files/munin/config/host/${fqdn}/logrotate", - "puppet://$server/files/munin/config/host/logrotate.$operatingsystem", - "puppet://$server/files/munin/config/host/logrotate", + source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/logrotate", + "puppet://$server/modules/site-munin/config/host/logrotate.$operatingsystem", + "puppet://$server/modules/site-munin/config/host/logrotate", "puppet://$server/modules/munin/config/host/logrotate.$operatingsystem", "puppet://$server/modules/munin/config/host/logrotate" ], owner => root, group => 0, mode => 0644; -- cgit v1.2.3