From: Silvio Rhatto Date: Sun, 8 Nov 2009 17:00:24 +0000 (-0200) Subject: Ensure that docroot parent folder creation is just defined once X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=52131ffc1d82a4ce3ef3aa7c764b1e6b900bd2ba;p=puppet-apache.git Ensure that docroot parent folder creation is just defined once --- diff --git a/manifests/init.pp b/manifests/init.pp index 8a9a548..077e5e2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -74,6 +74,14 @@ class apache { '': { $apache_www_folder = '/var/www' } } + case $apache_error_folder { + '': { $apache_error_folder = '/var/www/error' } + } + + case $apache_error_dest { + '': { $apache_error_dest = '/var/www/error/index.html' } + } + define site($ensure = present, $docroot = false, $redirect = false, $protocol = 'http', $server_alias = false, $use = false, $ticket = false) { @@ -112,9 +120,11 @@ class apache { recurse => true, } } - # Ensure parent folder exist - exec { "/bin/mkdir -p ${docroot}": - before => File["${docroot}"], + if !defined(Exec["/bin/mkdir -p ${docroot}"]) { + # Ensure parent folder exist + exec { "/bin/mkdir -p ${docroot}": + before => File["${docroot}"], + } } exec { "/usr/sbin/a2ensite $name": unless => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$name ] \