projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into staging
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
module.pp
diff --git
a/modules/apache2/manifests/module.pp
b/modules/apache2/manifests/module.pp
index
3a6922b
..
ff26ea6
100644
(file)
--- a/
modules/apache2/manifests/module.pp
+++ b/
modules/apache2/manifests/module.pp
@@
-3,15
+3,17
@@
define apache2::module ($ensure = present) {
present: {
exec { "/usr/sbin/a2enmod ${name}":
creates => "/etc/apache2/mods-enabled/${name}.load",
present: {
exec { "/usr/sbin/a2enmod ${name}":
creates => "/etc/apache2/mods-enabled/${name}.load",
+ require => Package['apache2'],
notify => Service['apache2']
}
}
absent: {
exec { "/usr/sbin/a2dismod ${name}":
notify => Service['apache2']
}
}
absent: {
exec { "/usr/sbin/a2dismod ${name}":
- onlyif => "test -L /etc/apache2/mods-enabled/${name}.load",
- notify => Service['apache2']
+ onlyif => "test -L /etc/apache2/mods-enabled/${name}.load",
+ require => Package['apache2'],
+ notify => Service['apache2']
}
}
}
}
- default: {
err
( "Unknown ensure value: '$ensure'" ) }
+ default: {
fail
( "Unknown ensure value: '$ensure'" ) }
}
}
}
}