From 23b3b3caca4b00f900ed323e7186453eb23ff6f6 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 30 Oct 2009 22:05:22 +0100 Subject: switch to new lsb way --- manifests/init.pp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index e5a92af..983c7d5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,7 +16,3 @@ # IP addresses and still be happy modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } - -case $operatingsystem { - debian,ubuntu: { include assert_lsbdistcodename } -} -- cgit v1.2.3 From ab0c496979e18b6a2ef1a550e2385766c76f765e Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 10 Dec 2009 16:08:30 -0500 Subject: adapt module_dir to new common module and create 'munin' base class to provide it, instead of doing an import --- manifests/init.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 983c7d5..578c4bb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,4 +15,6 @@ # the port is a parameter so vservers can share # IP addresses and still be happy -modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } +class munin { + module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } +} -- cgit v1.2.3 From eef1345dd22c54b593966d0bede2d16747f01aa7 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 9 May 2010 23:45:06 +0200 Subject: adjust module_dir --- manifests/init.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 578c4bb..5c4feeb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,5 +16,6 @@ # IP addresses and still be happy class munin { + include common::moduledir module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } } -- cgit v1.2.3 From 4591a91f7a8b169d0aa3ccb46357c60f8dcb7079 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 13 May 2010 14:12:07 -0400 Subject: remove tabs and trailing whitespaces in manifests --- manifests/init.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 5c4feeb..bae83a4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,17 +2,17 @@ # munin module # munin.pp - everything a sitewide munin installation needs # Copyright (C) 2007 David Schmitt -# +# # Copyright 2008, Puzzle ITC GmbH # Marcel Härry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # -# This program is free software; you can redistribute -# it and/or modify it under the terms of the GNU -# General Public License version 3 as published by +# This program is free software; you can redistribute +# it and/or modify it under the terms of the GNU +# General Public License version 3 as published by # the Free Software Foundation. # -# the port is a parameter so vservers can share +# the port is a parameter so vservers can share # IP addresses and still be happy class munin { -- cgit v1.2.3