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/simplemachine.pp | |
parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) |
fix various puppet language things
Diffstat (limited to 'manifests/vhost/php/simplemachine.pp')
-rw-r--r-- | manifests/vhost/php/simplemachine.pp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/manifests/vhost/php/simplemachine.pp b/manifests/vhost/php/simplemachine.pp index 78a165e..b5178da 100644 --- a/manifests/vhost/php/simplemachine.pp +++ b/manifests/vhost/php/simplemachine.pp @@ -62,7 +62,7 @@ define apache::vhost::php::simplemachine( $manage_directories = true ){ $documentroot = $path ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { openbsd => "/var/www/htdocs/${name}/www", default => "/var/www/vhosts/${name}/www" }, @@ -105,15 +105,15 @@ define apache::vhost::php::simplemachine( htpasswd_path => $htpasswd_path, manage_directories => $manage_directories, managed_directories => [ - "$documentroot/agreement.txt", - "$documentroot/attachments", - "$documentroot/avatars", - "$documentroot/cache", - "$documentroot/Packages", - "$documentroot/Packages/installed.list", - "$documentroot/Smileys", - "$documentroot/Themes", - "$documentroot/Themes/default/languages/Install.english.php" + "${documentroot}/agreement.txt", + "${documentroot}/attachments", + "${documentroot}/avatars", + "${documentroot}/cache", + "${documentroot}/Packages", + "${documentroot}/Packages/installed.list", + "${documentroot}/Smileys", + "${documentroot}/Themes", + "${documentroot}/Themes/default/languages/Install.english.php" ], manage_config => $manage_config, config_webwriteable => $config_webwriteable, |