diff options
Diffstat (limited to 'manifests/vhost')
-rw-r--r-- | manifests/vhost/modperl.pp | 2 | ||||
-rw-r--r-- | manifests/vhost/passenger.pp | 2 | ||||
-rw-r--r-- | manifests/vhost/php/standard.pp | 2 | ||||
-rw-r--r-- | manifests/vhost/php/webapp.pp | 13 | ||||
-rw-r--r-- | manifests/vhost/template.pp | 4 |
5 files changed, 19 insertions, 4 deletions
diff --git a/manifests/vhost/modperl.pp b/manifests/vhost/modperl.pp index 35842dc..c93e6cf 100644 --- a/manifests/vhost/modperl.pp +++ b/manifests/vhost/modperl.pp @@ -83,7 +83,6 @@ define apache::vhost::modperl( mode => $documentroot_mode; } - $passing_extension = 'pl' if $ensure != 'absent' { case $run_mode { 'proxy-itk','static-itk': { @@ -146,6 +145,7 @@ define apache::vhost::modperl( mod_security_relevantonly => $mod_security_relevantonly, mod_security_rules_to_disable => $mod_security_rules_to_disable, mod_security_additional_options => $mod_security_additional_options, + passing_extension => 'pl' } } diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp index 0507add..6886f13 100644 --- a/manifests/vhost/passenger.pp +++ b/manifests/vhost/passenger.pp @@ -76,7 +76,6 @@ define apache::vhost::passenger( }, default => $path } - $gempath = "${real_path}/gems" file{ ["${real_path}/www/tmp", "${real_path}/www/log"]: ensure => directory, @@ -132,6 +131,7 @@ define apache::vhost::passenger( mod_security_relevantonly => $mod_security_relevantonly, mod_security_rules_to_disable => $mod_security_rules_to_disable, mod_security_additional_options => $mod_security_additional_options, + gempath => "${real_path}/gems" } } diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index b02e05c..bbfebc4 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -178,7 +178,6 @@ define apache::vhost::php::standard( $real_php_settings = merge($std_php_settings,$php_settings) - $passing_extension = 'php' if $ensure != 'absent' { case $run_mode { 'proxy-itk','static-itk': { @@ -245,6 +244,7 @@ define apache::vhost::php::standard( mod_security_rules_to_disable => $mod_security_rules_to_disable, mod_security_additional_options => $mod_security_additional_options, use_mod_macro => $use_mod_macro, + passing_extension => $passing_extension, } } diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index 3711c1a..54905ca 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -75,6 +75,19 @@ define apache::vhost::php::webapp( if $manage_config { if $config_file == 'absent' { fail("No config file defined for ${name} on ${::fqdn}, if you'd like to manage the config, you have to add one!") } + + $real_path = $path ? { + 'absent' => $::operatingsystem ? { + openbsd => "/var/www/htdocs/${name}", + default => "/var/www/vhosts/${name}" + }, + default => $path + } + if $path_is_webdir { + $documentroot = $real_path + } else { + $documentroot = "${real_path}/www" + } ::apache::vhost::file::documentrootfile{"configurationfile_${name}": documentroot => $documentroot, filename => $config_file, diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index c19faba..4c9ab3f 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -71,7 +71,9 @@ define apache::vhost::template( $htpasswd_file = 'absent', $htpasswd_path = 'absent', $ldap_auth = false, - $ldap_user = 'any' + $ldap_user = 'any', + $passing_extension = 'absent', + $gempath = 'absent' ){ $real_path = $path ? { 'absent' => $::operatingsystem ? { |