summaryrefslogtreecommitdiff
path: root/manifests/vhost/php/spip.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-05-31 11:38:45 +0200
committermh <mh@immerda.ch>2012-05-31 11:38:45 +0200
commit076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch)
treedae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /manifests/vhost/php/spip.pp
parent4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff)
fix various puppet language things
Diffstat (limited to 'manifests/vhost/php/spip.pp')
-rw-r--r--manifests/vhost/php/spip.pp9
1 files changed, 7 insertions, 2 deletions
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,
}
}