summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp30
1 files changed, 16 insertions, 14 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 360335f..8a02cc0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -128,21 +128,23 @@ class apache {
case $ensure {
'present': {
- if !defined(File["${docroot}"]) {
- file { "${docroot}":
- ensure => present,
- owner => root,
- group => root,
- mode => 0755,
- recurse => false,
+ if $docroot != false {
+ if !defined(File["${docroot}"]) {
+ file { "${docroot}":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0755,
+ recurse => false,
+ }
}
- }
- if !defined(Exec["check_docroot_${docroot}"]) {
- # Ensure parent folder exist
- exec { "check_docroot_${docroot}":
- command => "/bin/mkdir -p ${docroot}",
- unless => "/bin/sh -c '[ -e ${docroot} ]'",
- before => File["${docroot}"],
+ if !defined(Exec["check_docroot_${docroot}"]) {
+ # Ensure parent folder exist
+ exec { "check_docroot_${docroot}":
+ command => "/bin/mkdir -p ${docroot}",
+ unless => "/bin/sh -c '[ -e ${docroot} ]'",
+ before => File["${docroot}"],
+ }
}
}
exec { "/usr/sbin/a2ensite $name":