From 076909377eaa3aa41936e3acb7e02a9b5b14d493 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 31 May 2012 11:38:45 +0200
Subject: fix various puppet language things

---
 manifests/vhost/php/spip.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'manifests/vhost/php/spip.pp')

diff --git a/manifests/vhost/php/spip.pp b/manifests/vhost/php/spip.pp
index 696ac8b..5f4ffdb 100644
--- a/manifests/vhost/php/spip.pp
+++ b/manifests/vhost/php/spip.pp
@@ -59,7 +59,7 @@ define apache::vhost::php::spip(
     $htpasswd_path = 'absent'
 ){
     $documentroot = $path ? {
-        'absent' => $operatingsystem ? {
+        'absent' => $::operatingsystem ? {
             openbsd => "/var/www/htdocs/${name}/www",
             default => "/var/www/vhosts/${name}/www"
         },
@@ -100,7 +100,12 @@ define apache::vhost::php::spip(
         vhost_destination => $vhost_destination,
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,
-        managed_directories => [ "$documentroot/IMG", "$documentroot/tmp", "$documentroot/local", "$documentroot/config" ],
+        managed_directories => [
+          "${documentroot}/IMG",
+          "${documentroot}/tmp",
+          "${documentroot}/local",
+          "${documentroot}/config"
+        ],
         manage_config => false,
     }
 }
-- 
cgit v1.2.3