unify logdir
authormh <mh@immerda.ch>
Wed, 29 Jan 2014 22:32:52 +0000 (23:32 +0100)
committermh <mh@immerda.ch>
Wed, 29 Jan 2014 22:32:52 +0000 (23:32 +0100)
manifests/client/openbsd.pp

index 5ced4c4..64ea588 100644 (file)
@@ -1,6 +1,6 @@
 # generate a few missing things on openbsd
 class munin::client::openbsd inherits munin::client::base {
-  file{[ '/var/run/munin', '/var/log/munin' ]:
+  file{[ '/var/run/munin', '/var/log/munin-node' ]:
     ensure  => directory,
     owner   => root,
     group   => 0,
@@ -17,10 +17,10 @@ class munin::client::openbsd inherits munin::client::base {
     status      => 'test -e /var/run/munin/munin-node.pid && (ps ax | egrep -q "^ *$(cat /var/run/munin/munin-node.pid).*munin-node")',
     hasstatus   => true,
     hasrestart  => true,
-    require     => [ File['/var/run/munin'], File['/var/log/munin'] ],
+    require     => [ File['/var/run/munin'], File['/var/log/munin-munin'] ],
   }
   cron{'clean_munin_logfile':
-    command => 'rm /var/log/munin/munin-node.log; kill -HUP `cat /var/run/munin/munin-node.pid`',
+    command => 'rm /var/log/munin-node/munin-node.log; kill -HUP `cat /var/run/munin/munin-node.pid`',
     minute  => 0,
     hour    => 2,
     weekday => 0,