diff options
author | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
commit | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch) | |
tree | dae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /manifests/vhost/php/silverstripe.pp | |
parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) |
fix various puppet language things
Diffstat (limited to 'manifests/vhost/php/silverstripe.pp')
-rw-r--r-- | manifests/vhost/php/silverstripe.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/vhost/php/silverstripe.pp b/manifests/vhost/php/silverstripe.pp index d120f04..da58296 100644 --- a/manifests/vhost/php/silverstripe.pp +++ b/manifests/vhost/php/silverstripe.pp @@ -61,11 +61,11 @@ define apache::vhost::php::silverstripe( $config_webwriteable = false, $manage_directories = true ){ - + include ::apache::include::silverstripe - + $documentroot = $path ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { openbsd => "/var/www/htdocs/${name}/www", default => "/var/www/vhosts/${name}/www" }, @@ -109,7 +109,7 @@ define apache::vhost::php::silverstripe( htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, manage_directories => $manage_directories, - managed_directories => [ "$documentroot/assets" ], + managed_directories => [ "${documentroot}/assets" ], manage_config => $manage_config, } |