summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-11-08 11:43:02 -0200
committerSilvio Rhatto <rhatto@riseup.net>2009-11-08 11:43:02 -0200
commit1f05de76f5ef8350f75bf7b6b27c1ef5a490684e (patch)
treebddb5c7cb74f23931991f60f2ef0a4d7c569c848
parente44524589d7136a262d7a264535b736c8881c977 (diff)
downloadpuppet-apache-1f05de76f5ef8350f75bf7b6b27c1ef5a490684e.tar.gz
puppet-apache-1f05de76f5ef8350f75bf7b6b27c1ef5a490684e.tar.bz2
Moving out require parameter from site definition
-rw-r--r--manifests/init.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index cd220da..b944e07 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -75,7 +75,7 @@ class apache {
# TODO: ensure folders exist with right modes and ownership
define site($ensure = present, $docroot = false, $redirect = false,
- $protocol = 'http', $server_alias = false, $use = false) {
+ $protocol = 'http', $server_alias = false, $use = false) {
file { "${apache2_sites}-available/$title":
ensure => $ensure,
content => template('apache/website.erb'),
@@ -106,7 +106,6 @@ class apache {
unless => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \
&& [ ${apache2_sites}-enabled/$name -ef ${apache2_sites}-available/$name ]'",
notify => Exec["reload-apache2"],
- require => Package[$require],
}
}
'absent': {
@@ -114,7 +113,6 @@ class apache {
onlyif => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \
&& [ ${apache2_sites}-enabled/$name -ef ${apache2_sites}-available/$name ]'",
notify => Exec["reload-apache2"],
- require => Package["apache2"],
}
}
default: { err ("Unknown ensure value: '$ensure'") }