summaryrefslogtreecommitdiff
path: root/manifests/vhost/php/drupal.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/drupal.pp
parent4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff)
fix various puppet language things
Diffstat (limited to 'manifests/vhost/php/drupal.pp')
-rw-r--r--manifests/vhost/php/drupal.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp
index d07beb7..4025ada 100644
--- a/manifests/vhost/php/drupal.pp
+++ b/manifests/vhost/php/drupal.pp
@@ -70,7 +70,7 @@ define apache::vhost::php::drupal(
$manage_cron = true
){
$documentroot = $path ? {
- 'absent' => $operatingsystem ? {
+ 'absent' => $::operatingsystem ? {
openbsd => "/var/www/htdocs/${name}/www",
default => "/var/www/vhosts/${name}/www"
},
@@ -89,7 +89,7 @@ define apache::vhost::php::drupal(
owner => root, group => 0, mode => 0644;
}
}
-
+
$std_drupal_php_settings = {
magic_quotes_gpc => 0,
register_globals => 0,
@@ -98,7 +98,7 @@ define apache::vhost::php::drupal(
'mbstring.http_output' => 'pass',
'mbstring.encoding_translation' => 0,
}
-
+
# create vhost configuration file
::apache::vhost::php::webapp{$name:
ensure => $ensure,