From f07f6a5fab8964acebb0821094597fa4a597dba2 Mon Sep 17 00:00:00 2001 From: am Date: Fri, 30 Nov 2007 15:28:46 +0000 Subject: munin installation (+ test auf immer1-0) git-svn-id: https://svn/ipuppet/trunk/modules/munin@173 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- manifests/init.pp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 manifests/init.pp (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp new file mode 100644 index 0000000..a1ea92c --- /dev/null +++ b/manifests/init.pp @@ -0,0 +1,17 @@ +# munin.pp - everything a sitewide munin installation needs +# Copyright (C) 2007 David Schmitt +# See LICENSE for the full license granted to you. + +# the port is a parameter so vservers can share IP addresses and still be happy + +# Define where the individual nodes' configs are stored +$NODESDIR="/var/lib/puppet/modules/munin/nodes" + +modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } + +import "host.pp" +import "client.pp" +import "plugin.pp" + +include assert_lsbdistcodename + -- cgit v1.2.3 From 322e46b3d2ac0447e5d681491c82df9fbba25292 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 14 Feb 2008 17:18:23 +0000 Subject: fixed lsb release stuff it should be like that git-svn-id: https://svn/ipuppet/trunk/modules/munin@815 d66ca3ae-40d7-4aa7-90d4-87d79ca94279 --- 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 a1ea92c..9c4b1de 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,5 +13,7 @@ import "host.pp" import "client.pp" import "plugin.pp" -include assert_lsbdistcodename +case $operatingsystem { + debian,ubuntu: { include assert_lsbdistcodename } +} -- cgit v1.2.3 From ebdcae0d53a7ee50e2abb2f6606f731cb76c83e8 Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Tue, 22 Apr 2008 11:28:54 +0200 Subject: empty module $MODULENAME --- manifests/init.pp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 manifests/init.pp (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp new file mode 100644 index 0000000..c4c4db0 --- /dev/null +++ b/manifests/init.pp @@ -0,0 +1,9 @@ +####################################### +# munin module +# Puzzle ITC - haerry+puppet(at)puzzle.ch +# GPLv3 +####################################### + + +# modules_dir { "munin": } +class munin {} -- cgit v1.2.3 From 4014ccdfea44498e8abd51a33073e0c5ecde0c36 Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Tue, 22 Apr 2008 11:52:31 +0200 Subject: merged last things --- 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 e1f62a6..6b6cd08 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,12 +1,8 @@ # munin.pp - everything a sitewide munin installation needs # Copyright (C) 2007 David Schmitt # See LICENSE for the full license granted to you. -<<<<<<< HEAD:manifests/init.pp # adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch # -======= - ->>>>>>> immerda/master:manifests/init.pp # the port is a parameter so vservers can share IP addresses and still be happy # Define where the individual nodes' configs are stored -- cgit v1.2.3 From 07a5491ba8f4fb8cbf556eebf562da918548bda0 Mon Sep 17 00:00:00 2001 From: Simon Josi Date: Thu, 29 May 2008 18:39:42 +0200 Subject: added puzzle copyright notice --- manifests/init.pp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 6b6cd08..b0c2ba1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,9 +1,19 @@ +# +# munin module # munin.pp - everything a sitewide munin installation needs # Copyright (C) 2007 David Schmitt -# See LICENSE for the full license granted to you. -# adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch +# +# 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 +# the Free Software Foundation. # -# the port is a parameter so vservers can share IP addresses and still be happy +# the port is a parameter so vservers can share +# IP addresses and still be happy # Define where the individual nodes' configs are stored $NODESDIR="/var/lib/puppet/modules/munin/nodes" -- cgit v1.2.3 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/init.pp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index b0c2ba1..e5a92af 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,15 +15,8 @@ # the port is a parameter so vservers can share # IP addresses and still be happy -# Define where the individual nodes' configs are stored -$NODESDIR="/var/lib/puppet/modules/munin/nodes" - modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } -import "host.pp" -import "client.pp" -import "plugin.pp" - case $operatingsystem { debian,ubuntu: { include assert_lsbdistcodename } } -- cgit v1.2.3 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