From e0a6be3508d29a2d182a762b6a93e54c03e3a183 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 16 Nov 2008 19:46:29 +0000 Subject: merged with puzzle --- manifests/defines.pp | 13 +++++++++++++ manifests/extensions/dbd_mysql.pp | 6 ++++++ manifests/extensions/ldap.pp | 5 +++++ manifests/extensions/net_dns.pp | 5 +++++ manifests/init.pp | 12 ++++++------ 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 manifests/defines.pp create mode 100644 manifests/extensions/dbd_mysql.pp create mode 100644 manifests/extensions/ldap.pp create mode 100644 manifests/extensions/net_dns.pp diff --git a/manifests/defines.pp b/manifests/defines.pp new file mode 100644 index 0000000..c4055bd --- /dev/null +++ b/manifests/defines.pp @@ -0,0 +1,13 @@ +# manifests/defines.pp + +define perl::module ( + $ensure = 'present' +) { + include perl + + package {"perl-${name}": + ensure => $ensure, + require => Package['perl'], + } +} + diff --git a/manifests/extensions/dbd_mysql.pp b/manifests/extensions/dbd_mysql.pp new file mode 100644 index 0000000..adb3e3e --- /dev/null +++ b/manifests/extensions/dbd_mysql.pp @@ -0,0 +1,6 @@ +# manifests/extensions/dbd_mysql.pp + +class perl::extensions::dbd_mysql { + perl::module{'DBD-mysql': } +} + diff --git a/manifests/extensions/ldap.pp b/manifests/extensions/ldap.pp new file mode 100644 index 0000000..225db1a --- /dev/null +++ b/manifests/extensions/ldap.pp @@ -0,0 +1,5 @@ +# manifests/extensions/ldap.pp + +class perl::extensions::ldap { + perl::module{'LDAP': } +} diff --git a/manifests/extensions/net_dns.pp b/manifests/extensions/net_dns.pp new file mode 100644 index 0000000..6c39713 --- /dev/null +++ b/manifests/extensions/net_dns.pp @@ -0,0 +1,5 @@ +# manifests/extensions/net_dns.pp + +class perl::extensions::net_dns { + perl::module{'Net-DNS': } +} diff --git a/manifests/init.pp b/manifests/init.pp index 45ebb2a..8517831 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,11 @@ # modules/perl/manifests/init.pp - manage perl stuff -# Copyright (C) 2007 admin@immerda.ch +# Copyright (C) 2007 admin(at)immerda.ch # GPLv3 +# adapted by Puzzle ITC +# Marcel Härry haerry+puppet(at)puzzle.ch +# Simon Josi josi+puppet(at)puzzle.ch + +import 'defines.pp' class perl { case $operatingsystem { @@ -12,9 +17,4 @@ class perl::base { package{'perl': ensure => installed, } - -} - -define perl::module () { - package { "${name}": ensure => installed } } -- cgit v1.2.3