*Add better support for idn domains

This commit is contained in:
Derrick Hammer 2016-10-23 19:06:38 -04:00
commit a0cf86cd28
683 changed files with 683 additions and 683 deletions

View file

@ -38,7 +38,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -32,7 +32,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -37,7 +37,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -31,7 +31,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -43,7 +43,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -38,7 +38,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -32,7 +32,7 @@
SSLCertificateKeyFile %ssl_key% SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca% %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -33,7 +33,7 @@
SSLCertificateKeyFile %ssl_key% SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca% %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -40,5 +40,5 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -37,5 +37,5 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -31,6 +31,6 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -28,6 +28,6 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -33,6 +33,6 @@ server {
disable_symlinks if_not_owner from=%docroot%; disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -30,6 +30,6 @@ server {
disable_symlinks if_not_owner from=%docroot%; disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -57,5 +57,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -53,5 +53,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -123,5 +123,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -119,5 +119,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -51,5 +51,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -47,5 +47,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -68,5 +68,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -63,5 +63,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -98,5 +98,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -95,5 +95,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -59,5 +59,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -55,5 +55,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -65,5 +65,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -61,5 +61,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -86,5 +86,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -83,5 +83,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -43,5 +43,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -39,5 +39,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -81,5 +81,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -82,5 +82,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -69,5 +69,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -65,5 +65,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -62,5 +62,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -58,5 +58,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -51,5 +51,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -47,5 +47,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -63,5 +63,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -59,5 +59,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -38,7 +38,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -32,7 +32,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -37,7 +37,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -31,7 +31,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -43,7 +43,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -37,7 +37,7 @@
AssignUserID %user% %group% AssignUserID %user% %group%
</IfModule> </IfModule>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -32,7 +32,7 @@
SSLCertificateKeyFile %ssl_key% SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca% %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -33,7 +33,7 @@
SSLCertificateKeyFile %ssl_key% SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca% %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -25,7 +25,7 @@
<Directory %home%/%user%/web/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
</VirtualHost> </VirtualHost>

View file

@ -40,5 +40,5 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -37,5 +37,5 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -31,6 +31,6 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -28,6 +28,6 @@ server {
location ~ /\.hg/ {return 404;} location ~ /\.hg/ {return 404;}
location ~ /\.bzr/ {return 404;} location ~ /\.bzr/ {return 404;}
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -33,6 +33,6 @@ server {
disable_symlinks if_not_owner from=%docroot%; disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -30,6 +30,6 @@ server {
disable_symlinks if_not_owner from=%docroot%; disable_symlinks if_not_owner from=%docroot%;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -57,5 +57,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -53,5 +53,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -52,5 +52,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -48,5 +48,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -123,5 +123,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -119,5 +119,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -51,5 +51,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -47,5 +47,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -68,5 +68,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -63,5 +63,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -97,5 +97,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -94,5 +94,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -98,5 +98,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -95,5 +95,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -59,5 +59,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -55,5 +55,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -65,5 +65,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -61,5 +61,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -86,5 +86,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -83,5 +83,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -43,5 +43,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/snginx.%domain%.conf*; include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
} }

View file

@ -39,5 +39,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -81,5 +81,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -82,5 +82,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -69,5 +69,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -65,5 +65,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -62,5 +62,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

View file

@ -58,5 +58,5 @@ server {
include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/phppgadmin.inc*;
include /etc/nginx/conf.d/webmail.inc*; include /etc/nginx/conf.d/webmail.inc*;
include %home%/%user%/conf/web/nginx.%domain%.conf*; include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
} }

Some files were not shown because too many files have changed in this diff Show more