From 2061a0174f1984ede880693d5a4988c536fc3185 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 11 Aug 2011 23:22:16 +0300
Subject: [PATCH] changed include widlcard order to match web stats configs

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

diff --git a/data/templates/apache_default.stpl b/data/templates/apache_default.stpl
index 39b8e59a..f4903b7c 100644
--- a/data/templates/apache_default.stpl
+++ b/data/templates/apache_default.stpl
@@ -34,7 +34,7 @@
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
-    Include %home%/%user%/conf/%domain%.shttpd.*
+    Include %home%/%user%/conf/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_default.tpl b/data/templates/apache_default.tpl
index 6274f885..919b5337 100644
--- a/data/templates/apache_default.tpl
+++ b/data/templates/apache_default.tpl
@@ -28,7 +28,7 @@
         AllowOverride All
     </Directory>
     php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp
-    Include %home%/%user%/conf/%domain%.httpd.*
+    Include %home%/%user%/conf/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_phpcgi.stpl b/data/templates/apache_phpcgi.stpl
index 39b8e59a..f4903b7c 100644
--- a/data/templates/apache_phpcgi.stpl
+++ b/data/templates/apache_phpcgi.stpl
@@ -34,7 +34,7 @@
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
-    Include %home%/%user%/conf/%domain%.shttpd.*
+    Include %home%/%user%/conf/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_phpcgi.tpl b/data/templates/apache_phpcgi.tpl
index 93f62c04..91215220 100644
--- a/data/templates/apache_phpcgi.tpl
+++ b/data/templates/apache_phpcgi.tpl
@@ -24,7 +24,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/%domain%.httpd.*
+    Include %home%/%user%/conf/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_unlim.stpl b/data/templates/apache_unlim.stpl
index f1266447..3515e21a 100644
--- a/data/templates/apache_unlim.stpl
+++ b/data/templates/apache_unlim.stpl
@@ -34,7 +34,7 @@
     SSLCertificateFile %ssl_cert%
     SSLCertificateKeyFile %ssl_key%
 
-    Include %home%/%user%/conf/%domain%.shttpd.*
+    Include %home%/%user%/conf/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/apache_unlim.tpl b/data/templates/apache_unlim.tpl
index 8609f776..a9d67ada 100644
--- a/data/templates/apache_unlim.tpl
+++ b/data/templates/apache_unlim.tpl
@@ -28,7 +28,7 @@
         AllowOverride All
     </Directory>
     php_admin_value open_basedir none
-    Include %home%/%user%/conf/%domain%.httpd.*
+    Include %home%/%user%/conf/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/data/templates/ngingx_vhost_default.stpl b/data/templates/ngingx_vhost_default.stpl
index cbf2959f..addc6dbd 100644
--- a/data/templates/ngingx_vhost_default.stpl
+++ b/data/templates/ngingx_vhost_default.stpl
@@ -30,6 +30,6 @@ server {
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
 
-    include %home%/%user%/conf/%domain%.nginx.*;
+    include %home%/%user%/conf/snginx.%domain%.conf*;
 }
 
diff --git a/data/templates/ngingx_vhost_default.tpl b/data/templates/ngingx_vhost_default.tpl
index cda9f9f2..0d02d638 100644
--- a/data/templates/ngingx_vhost_default.tpl
+++ b/data/templates/ngingx_vhost_default.tpl
@@ -27,6 +27,6 @@ server {
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
 
-    include %home%/%user%/conf/%domain%.nginx.*;
+    include %home%/%user%/conf/nginx.%domain%.conf*;
 }