From d2a2cb77b9a9ca5deddecdec3d14ac763388929e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 3 Nov 2013 17:46:46 +0100
Subject: cleanup openbsd manual installation + remove unnecessary files

The manual OpenBSD installation is now so old and not needed
anymore.
---
 manifests/client/openbsd.pp | 40 +++-------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

(limited to 'manifests/client/openbsd.pp')

diff --git a/manifests/client/openbsd.pp b/manifests/client/openbsd.pp
index e3c18d5..5ced4c4 100644
--- a/manifests/client/openbsd.pp
+++ b/manifests/client/openbsd.pp
@@ -1,53 +1,19 @@
-# currently we install munin on openbsd by targz
-# :(
-
+# generate a few missing things on openbsd
 class munin::client::openbsd inherits munin::client::base {
-  if $::operatingsystemrelease == '4.3' {
-    file{'/usr/src/munin_openbsd.tar.gz':
-      source  => 'puppet:///modules/munin/openbsd/package/munin_openbsd.tar.gz',
-      owner   => root,
-      group   => 0,
-      mode    => '0600';
-    }
-    exec{'extract_openbsd':
-      command => 'cd /;tar xzf /usr/src/munin_openbsd.tar.gz',
-      unless  => 'test -d /opt/munin',
-      require => File['/usr/src/munin_openbsd.tar.gz'],
-      before  => File['/var/run/munin'],
-    }
-    package{'p5-Compress-Zlib':
-      ensure => installed,
-      before => File['/var/run/munin'],
-    }
-  } else {
-    package{'munin-node':
-      ensure => installed,
-    }
-  }
-  package{ [  'p5-Crypt-SSLeay', 'p5-HTML-Parser', 'p5-HTML-Tagset', 'p5-HTTP-GHTTP',
-              'p5-LWP-UserAgent-Determined', 'p5-Net-SSLeay', 'p5-Net-Server',
-              'p5-URI', 'p5-libwww', 'pcre', 'curl' ]:
-    ensure => installed,
-    before => File['/var/run/munin'],
-  }
   file{[ '/var/run/munin', '/var/log/munin' ]:
     ensure  => directory,
     owner   => root,
     group   => 0,
     mode    => '0755';
   }
-  $bin_loc = $::operatingsystemrelease ? {
-    '4.3'   => '/opt/munin/sbin/munin-node',
-    default => '/usr/local/sbin/munin-node'
-  }
   openbsd::rc_local{'munin-node':
-    binary  => $bin_loc,
+    binary  => '/usr/local/sbin/munin-node',
     require => File['/var/run/munin'],
   }
   Service['munin-node']{
     restart     => '/bin/kill -HUP `/bin/cat /var/run/munin/munin-node.pid`',
     stop        => '/bin/kill `/bin/cat /var/run/munin/munin-node.pid`',
-    start       => $bin_loc,
+    start       => '/usr/local/sbin/munin-node',
     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,
-- 
cgit v1.2.3