From 5ca62deac91e0399481ec8c3c1e3b7961ee4c361 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 15 Jun 2011 01:11:06 +0300
Subject: [PATCH] added include to apache templates

---
 data/templates/apache_default.stpl | 4 ++--
 data/templates/apache_default.tpl  | 2 +-
 data/templates/apache_phpcgi.stpl  | 4 ++--
 data/templates/apache_phpcgi.tpl   | 2 +-
 data/templates/apache_unlim.stpl   | 4 ++--
 data/templates/apache_unlim.tpl    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/templates/apache_default.stpl b/data/templates/apache_default.stpl
index 0f6652317..9632eeb2f 100644
--- a/data/templates/apache_default.stpl
+++ b/data/templates/apache_default.stpl
@@ -25,16 +25,16 @@
         php_admin_value session.save_path %home%/%user%/tmp
         php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
     </Directory>
-
     <Directory %home%/%user%/domains/%domain%/stats>
         AllowOverride All
     </Directory>
     php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp
-
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
+    Include %home%/%user%/conf/%domain%.shttpd.*
+
 </VirtualHost>
 
diff --git a/data/templates/apache_default.tpl b/data/templates/apache_default.tpl
index e468a3ef2..074b07303 100644
--- a/data/templates/apache_default.tpl
+++ b/data/templates/apache_default.tpl
@@ -24,11 +24,11 @@
         php_admin_value session.save_path %home%/%user%/tmp
         php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
     </Directory>
-
     <Directory %home%/%user%/domains/%domain%/stats>
         AllowOverride All
     </Directory>
     php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp
+    Include %home%/%user%/conf/%domain%.httpd.*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_phpcgi.stpl b/data/templates/apache_phpcgi.stpl
index 27b839892..2a14c51a8 100644
--- a/data/templates/apache_phpcgi.stpl
+++ b/data/templates/apache_phpcgi.stpl
@@ -25,16 +25,16 @@
         php_admin_value session.save_path %home%/%user%/tmp
         php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
     </Directory>
-
     <Directory %home%/%user%/domains/%domain%/stats>
         AllowOverride All
     </Directory>
     php_admin_value open_basedir %home%/%user%/domains:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp
-
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
+    Include %home%/%user%/conf/%domain%.shttpd.*
+
 </VirtualHost>
 
diff --git a/data/templates/apache_phpcgi.tpl b/data/templates/apache_phpcgi.tpl
index 153e1d46c..048b6e19b 100644
--- a/data/templates/apache_phpcgi.tpl
+++ b/data/templates/apache_phpcgi.tpl
@@ -21,10 +21,10 @@
         AddHandler phpcgi-script .php
 
     </Directory>
-
     <Directory %home%/%user%/domains/%domain%/stats>
         AllowOverride All
     </Directory>
+    Include %home%/%user%/conf/%domain%.httpd.*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_unlim.stpl b/data/templates/apache_unlim.stpl
index 326ac2281..2c1e9854c 100644
--- a/data/templates/apache_unlim.stpl
+++ b/data/templates/apache_unlim.stpl
@@ -25,16 +25,16 @@
         php_admin_value session.save_path %home%/%user%/tmp
         php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
     </Directory>
-
     <Directory %home%/%user%/domains/%domain%/stats>
         AllowOverride All
     </Directory>
     php_admin_value open_basedir none
-
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
+    Include %home%/%user%/conf/%domain%.shttpd.*
+
 </VirtualHost>
 
diff --git a/data/templates/apache_unlim.tpl b/data/templates/apache_unlim.tpl
index b08f254bd..6417ad443 100644
--- a/data/templates/apache_unlim.tpl
+++ b/data/templates/apache_unlim.tpl
@@ -24,11 +24,11 @@
         php_admin_value session.save_path %home%/%user%/tmp
         php_admin_value sendmail_path '/usr/sbin/sendmail -t -i -f %email%'
     </Directory>
-
     <Directory %home%/%user%/domains/%domain%/stats>
         AllowOverride All
     </Directory>
     php_admin_value open_basedir none
+    Include %home%/%user%/conf/%domain%.httpd.*
 
 </VirtualHost>