Skip to content

Commit 44cdc17

Browse files
serghey-rodinserghey-rodin
authored
Merge pull request hestiacp#892 from pcfreak30/hotfix/891
*Add better support for idn domains
2 parents 86634b3 + a0cf86c commit 44cdc17

File tree

683 files changed

+683
-683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

683 files changed

+683
-683
lines changed

‎install/debian/7/templates/web/apache2/basedir.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
AssignUserID %user% %group%
3939
</IfModule>
4040

41-
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
41+
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
4242

4343
</VirtualHost>
4444

‎install/debian/7/templates/web/apache2/basedir.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
AssignUserID %user% %group%
3333
</IfModule>
3434

35-
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
35+
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
3636

3737
</VirtualHost>
3838

‎install/debian/7/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
AssignUserID %user% %group%
3838
</IfModule>
3939

40-
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
40+
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
4141

4242
</VirtualHost>
4343

‎install/debian/7/templates/web/apache2/default.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
AssignUserID %user% %group%
3232
</IfModule>
3333

34-
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
34+
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
3535

3636
</VirtualHost>
3737

‎install/debian/7/templates/web/apache2/hosting.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
AssignUserID %user% %group%
4444
</IfModule>
4545

46-
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
46+
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
4747

4848
</VirtualHost>
4949

‎install/debian/7/templates/web/apache2/hosting.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
AssignUserID %user% %group%
3939
</IfModule>
4040

41-
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
41+
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
4242

4343
</VirtualHost>
4444

‎install/debian/7/templates/web/apache2/phpcgi.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
SSLCertificateKeyFile %ssl_key%
3333
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
3434

35-
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
35+
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
3636

3737
</VirtualHost>
3838

‎install/debian/7/templates/web/apache2/phpcgi.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Directory %home%/%user%/web/%domain%/stats>
2626
AllowOverride All
2727
</Directory>
28-
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
28+
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
2929

3030
</VirtualHost>
3131

‎install/debian/7/templates/web/apache2/phpfcgid.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
SSLCertificateKeyFile %ssl_key%
3434
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
3535

36-
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
36+
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
3737

3838
</VirtualHost>
3939

‎install/debian/7/templates/web/apache2/phpfcgid.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Directory %home%/%user%/web/%domain%/stats>
2626
AllowOverride All
2727
</Directory>
28-
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
28+
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
2929

3030
</VirtualHost>
3131

0 commit comments

Comments
 (0)