Skip to content

Commit 2061a01

Browse files
committed
changed include widlcard order to match web stats configs
1 parent 924e277 commit 2061a01

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

data/templates/apache_default.stpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
SSLCertificateFile %ssl_cert%
3535
SSLCertificateKeyFile %ssl_key%
3636

37-
Include %home%/%user%/conf/%domain%.shttpd.*
37+
Include %home%/%user%/conf/shttpd.%domain%.conf*
3838

3939
</VirtualHost>
4040

data/templates/apache_default.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
AllowOverride All
2929
</Directory>
3030
php_admin_value open_basedir %home%/%user%/web:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp
31-
Include %home%/%user%/conf/%domain%.httpd.*
31+
Include %home%/%user%/conf/httpd.%domain%.conf*
3232

3333
</VirtualHost>
3434

data/templates/apache_phpcgi.stpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
SSLCertificateFile %ssl_cert%
3535
SSLCertificateKeyFile %ssl_key%
3636

37-
Include %home%/%user%/conf/%domain%.shttpd.*
37+
Include %home%/%user%/conf/shttpd.%domain%.conf*
3838

3939
</VirtualHost>
4040

data/templates/apache_phpcgi.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Directory %home%/%user%/web/%domain%/stats>
2525
AllowOverride All
2626
</Directory>
27-
Include %home%/%user%/conf/%domain%.httpd.*
27+
Include %home%/%user%/conf/httpd.%domain%.conf*
2828

2929
</VirtualHost>
3030

data/templates/apache_unlim.stpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
SSLCertificateFile %ssl_cert%
3535
SSLCertificateKeyFile %ssl_key%
3636

37-
Include %home%/%user%/conf/%domain%.shttpd.*
37+
Include %home%/%user%/conf/shttpd.%domain%.conf*
3838

3939
</VirtualHost>
4040

data/templates/apache_unlim.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
AllowOverride All
2929
</Directory>
3030
php_admin_value open_basedir none
31-
Include %home%/%user%/conf/%domain%.httpd.*
31+
Include %home%/%user%/conf/httpd.%domain%.conf*
3232

3333
</VirtualHost>
3434

data/templates/ngingx_vhost_default.stpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ server {
3030
location ~ /\.ht {deny all;}
3131
location ~ /.svn/ {deny all;}
3232

33-
include %home%/%user%/conf/%domain%.nginx.*;
33+
include %home%/%user%/conf/snginx.%domain%.conf*;
3434
}
3535

data/templates/ngingx_vhost_default.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ server {
2727
location ~ /\.ht {deny all;}
2828
location ~ /.svn/ {deny all;}
2929

30-
include %home%/%user%/conf/%domain%.nginx.*;
30+
include %home%/%user%/conf/nginx.%domain%.conf*;
3131
}
3232

0 commit comments

Comments
 (0)