From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 4 Mar 2016 22:17:16 +0000 (+0100)
Subject: munin-node: remove df-wrap
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=199cc1838cf43726fce8abda0d32a1b9e47d3620;p=mirror%2Fdsa-puppet.git

munin-node: remove df-wrap

Remove df-wrap as it is not compatible with the jessie scripts. Replace
df, df_abs and df_inode by symlinks to the original scripts.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/munin/files/df-wrap b/modules/munin/files/df-wrap
deleted file mode 100644
index b53f2bb20..000000000
--- a/modules/munin/files/df-wrap
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-# Calls the appropriate df plugin while filtering out short-lived entries
-# like the sbuild/schroot filesystems.
-
-# Copyright 2011 Peter Palfrader
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-case "${0##*/}" in
-	df)		plugin=/usr/share/munin/plugins/df       ; filter='^_dev\.|^_run|^_lib_init_rw|_sbuild_|_schroot_' ;;
-	df_abs)		plugin=/usr/share/munin/plugins/df_abs   ; filter='^tmpfs|^udev|_sbuild_|_schroot_' ;;
-	df_inode)	plugin=/usr/share/munin/plugins/df_inode ; filter='^_dev\.|^_run|^_lib_init_rw|_sbuild_|_schroot_' ;;
-	*)		echo >&2 "$0: Do not know which plugin to call based on script name."; exit 1 ;;
-esac
-
-"$plugin" "$@" | egrep -v "$filter"
diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 3f7f4ae0f..37b30303e 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -33,9 +33,23 @@ class munin {
 		require => Package['munin-node'],
 	}
 
-	file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
-		source => 'puppet:///modules/munin/df-wrap',
-		mode    => '0555',
+	file { '/etc/munin/plugins/df':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df',
+		require => Package['munin-node'],
+		notify  => Service['munin-node'],
+	}
+
+	file { '/etc/munin/plugins/df_abs':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df_abs',
+		require => Package['munin-node'],
+		notify  => Service['munin-node'],
+	}
+
+	file { '/etc/munin/plugins/df_inode':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df_inode',
 		require => Package['munin-node'],
 		notify  => Service['munin-node'],
 	}