From 7860f846aaa3c00ddc384f23a926d2a9630146c6 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 17 Aug 2010 10:52:07 +0200
Subject: remove includes in defines that are called a lot, it looks like
 compile time goes up with such includes

---
 manifests/vhost/file.pp         | 23 -----------------------
 manifests/vhost/php/standard.pp |  6 ------
 2 files changed, 29 deletions(-)

(limited to 'manifests')

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",
-- 
cgit v1.2.3