summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/vhost/file.pp23
-rw-r--r--manifests/vhost/php/standard.pp6
2 files changed, 0 insertions, 29 deletions
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp
index d9e006d..c4d5be6 100644
--- a/manifests/vhost/file.pp
+++ b/manifests/vhost/file.pp
@@ -82,33 +82,10 @@ define apache::vhost::file(
}
case $run_mode {
'itk': {
- include ::apache::itk
include ::apache::itk::lock
- if $ssl_mode {
- include ::apache::ssl::itk
- }
- if $mod_security {
- include mod_security::itk
- }
}
'proxy-itk','static-itk': {
- include ::apache::itk_plus
include ::apache::itk_plus::lock
- if $ssl_mode {
- include ::apache::ssl::itk_plus
- }
- if $mod_security {
- include ::mod_security::itk_plus
- }
- }
- default: {
- include ::apache
- if $ssl_mode {
- include ::apache::ssl
- }
- if $mod_security {
- include ::mod_security
- }
}
}
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 93ff289..9437046 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -90,12 +90,6 @@ define apache::vhost::php::standard(
run_uid => $run_uid,
}
- case $run_mode {
- 'itk': { include ::php::itk }
- 'proxy-itk','static-itk': { include ::php::itk_plus }
- default: { include ::php }
- }
-
$php_safe_mode_exec_bin_dir = $path ? {
'absent' => $operatingsystem ? {
openbsd => "/var/www/htdocs/${name}/bin",