From c01166a05d3a2aa3c62b913902cd6a247ab2616c Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 12 Jun 2010 08:54:15 +0200 Subject: get the decision branch right --- manifests/vhost/php/gallery2.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/gallery2.pp b/manifests/vhost/php/gallery2.pp index 7f38895..fde5d0d 100644 --- a/manifests/vhost/php/gallery2.pp +++ b/manifests/vhost/php/gallery2.pp @@ -68,11 +68,11 @@ define apache::vhost::php::gallery2( owner => $documentroot_owner, group => $documentroot_group, mode => 0660; } - if $upload_dir != 'present' { + if ($upload_dir == 'present') or ($upload_dir == 'absent') { $real_upload_dir = $operatingsystem ? { - openbsd => "/var/www/htdocs/${name}/upload", - default => "/var/www/vhosts/${name}/upload" - } + openbsd => "/var/www/htdocs/${name}/upload", + default => "/var/www/vhosts/${name}/upload" + } } else { $real_upload_dir = $upload_dir } -- cgit v1.2.3