From f534d097fb2ac5c49ce71f8a47d4de97efd22e28 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 20 Jul 2010 07:43:54 +0200 Subject: clean up some possible loops --- manifests/mod_dav_svn.pp | 3 +-- manifests/mod_macro.pp | 3 +-- manifests/status.pp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifests/mod_dav_svn.pp b/manifests/mod_dav_svn.pp index a213043..bdcc4ab 100644 --- a/manifests/mod_dav_svn.pp +++ b/manifests/mod_dav_svn.pp @@ -1,6 +1,5 @@ class apache::mod_dav_svn { - include apache - package{mod_dav_svn: + package{'mod_dav_svn': ensure => installed, require => Package['apache'], notify => Service['apache'], diff --git a/manifests/mod_macro.pp b/manifests/mod_macro.pp index acee280..eed59e5 100644 --- a/manifests/mod_macro.pp +++ b/manifests/mod_macro.pp @@ -1,6 +1,5 @@ class apache::mod_macro { - include apache - package{mod_macro: + package{'mod_macro': ensure => installed, require => Package['apache'], notify => Service['apache'], diff --git a/manifests/status.pp b/manifests/status.pp index d32069e..f67507c 100644 --- a/manifests/status.pp +++ b/manifests/status.pp @@ -1,6 +1,6 @@ # manifests/status.pp -class apache::status inherits apache { +class apache::status { case $operatingsystem { centos: { include apache::status::centos } defaults: { include apache::status::base } -- cgit v1.2.3