summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-11-06 12:04:49 -0200
committerSilvio Rhatto <rhatto@riseup.net>2009-11-06 12:04:49 -0200
commitf51372db663672cb6bb09bf8fb3bc9a44afb957b (patch)
tree3577fb58b98f7c2a28ff8278304c8319a2b39137 /manifests
parente27ff5d37a5c50db0d4b7e884f212d14f7cb8e74 (diff)
downloadpuppet-apache-f51372db663672cb6bb09bf8fb3bc9a44afb957b.tar.gz
puppet-apache-f51372db663672cb6bb09bf8fb3bc9a44afb957b.tar.bz2
Trying to fix module dependency issue
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 5fff3df..a93b3bb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -117,7 +117,7 @@ class apache {
require => Package["apache2"],
}
}
- default: { err ( "Unknown ensure value: '$ensure'" ) }
+ default: { err ("Unknown ensure value: '$ensure'") }
}
}
@@ -127,14 +127,14 @@ class apache {
# You can add a custom require (string) if the module depends on
# packages that aren't part of the default apache2 package. Because of
# the package dependencies, apache2 will automagically be included.
- define module ( $ensure = 'present', $require = 'apache2' ) {
+ define module($ensure = 'present', $require = 'Package[apache2]') {
case $ensure {
'present' : {
exec { "/usr/sbin/a2enmod $name":
unless => "/bin/sh -c '[ -L ${apache2_mods}-enabled/${name}.load ] \
&& [ ${apache2_mods}-enabled/${name}.load -ef ${apache2_mods}-available/${name}.load ]'",
notify => Exec["force-reload-apache2"],
- require => Package[$require],
+ require => $require,
}
}
'absent': {
@@ -145,7 +145,7 @@ class apache {
require => Package["apache2"],
}
}
- default: { err ( "Unknown ensure value: '$ensure'" ) }
+ default: { err ("Unknown ensure value: '$ensure'") }
}
}