diff --git a/install/debian/7/templates/web/apache2/basedir.stpl b/install/debian/7/templates/web/apache2/basedir.stpl index dda3aa760..a58eefc17 100644 --- a/install/debian/7/templates/web/apache2/basedir.stpl +++ b/install/debian/7/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/basedir.tpl b/install/debian/7/templates/web/apache2/basedir.tpl index 9449bc447..bac58f258 100644 --- a/install/debian/7/templates/web/apache2/basedir.tpl +++ b/install/debian/7/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/default.stpl b/install/debian/7/templates/web/apache2/default.stpl index 269c09711..e9866ef58 100644 --- a/install/debian/7/templates/web/apache2/default.stpl +++ b/install/debian/7/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/default.tpl b/install/debian/7/templates/web/apache2/default.tpl index c24b12796..7f0eacf94 100644 --- a/install/debian/7/templates/web/apache2/default.tpl +++ b/install/debian/7/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/hosting.stpl b/install/debian/7/templates/web/apache2/hosting.stpl index 627325e06..d65291db7 100644 --- a/install/debian/7/templates/web/apache2/hosting.stpl +++ b/install/debian/7/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/hosting.tpl b/install/debian/7/templates/web/apache2/hosting.tpl index 0bdd6ea68..ba7021841 100644 --- a/install/debian/7/templates/web/apache2/hosting.tpl +++ b/install/debian/7/templates/web/apache2/hosting.tpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/phpcgi.stpl b/install/debian/7/templates/web/apache2/phpcgi.stpl index aa807091a..1b8fddb5d 100644 --- a/install/debian/7/templates/web/apache2/phpcgi.stpl +++ b/install/debian/7/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/debian/7/templates/web/apache2/phpcgi.tpl b/install/debian/7/templates/web/apache2/phpcgi.tpl index fd603800b..d650e2aed 100644 --- a/install/debian/7/templates/web/apache2/phpcgi.tpl +++ b/install/debian/7/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/apache2/phpfcgid.stpl b/install/debian/7/templates/web/apache2/phpfcgid.stpl index 88cea0e64..996541585 100644 --- a/install/debian/7/templates/web/apache2/phpfcgid.stpl +++ b/install/debian/7/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/debian/7/templates/web/apache2/phpfcgid.tpl b/install/debian/7/templates/web/apache2/phpfcgid.tpl index 335b9f620..1f9f912f9 100644 --- a/install/debian/7/templates/web/apache2/phpfcgid.tpl +++ b/install/debian/7/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/7/templates/web/nginx/caching.stpl b/install/debian/7/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/debian/7/templates/web/nginx/caching.stpl +++ b/install/debian/7/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/7/templates/web/nginx/caching.tpl b/install/debian/7/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/debian/7/templates/web/nginx/caching.tpl +++ b/install/debian/7/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/7/templates/web/nginx/default.stpl b/install/debian/7/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/debian/7/templates/web/nginx/default.stpl +++ b/install/debian/7/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/debian/7/templates/web/nginx/default.tpl b/install/debian/7/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/debian/7/templates/web/nginx/default.tpl +++ b/install/debian/7/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/7/templates/web/nginx/hosting.stpl b/install/debian/7/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/debian/7/templates/web/nginx/hosting.stpl +++ b/install/debian/7/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/debian/7/templates/web/nginx/hosting.tpl b/install/debian/7/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/debian/7/templates/web/nginx/hosting.tpl +++ b/install/debian/7/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/apache2/basedir.stpl b/install/debian/8/templates/web/apache2/basedir.stpl index d978d4c43..cc3596a47 100644 --- a/install/debian/8/templates/web/apache2/basedir.stpl +++ b/install/debian/8/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/basedir.tpl b/install/debian/8/templates/web/apache2/basedir.tpl index 96c94a1bd..8e4f56913 100644 --- a/install/debian/8/templates/web/apache2/basedir.tpl +++ b/install/debian/8/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/default.stpl b/install/debian/8/templates/web/apache2/default.stpl index a7faa7219..557cb2385 100644 --- a/install/debian/8/templates/web/apache2/default.stpl +++ b/install/debian/8/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/default.tpl b/install/debian/8/templates/web/apache2/default.tpl index 3a2270156..fe7120146 100644 --- a/install/debian/8/templates/web/apache2/default.tpl +++ b/install/debian/8/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/hosting.stpl b/install/debian/8/templates/web/apache2/hosting.stpl index 8892072b1..ba751fe83 100644 --- a/install/debian/8/templates/web/apache2/hosting.stpl +++ b/install/debian/8/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/hosting.tpl b/install/debian/8/templates/web/apache2/hosting.tpl index 1eb269103..207e0bbe4 100644 --- a/install/debian/8/templates/web/apache2/hosting.tpl +++ b/install/debian/8/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/phpcgi.stpl b/install/debian/8/templates/web/apache2/phpcgi.stpl index 731355bc1..3c34cf358 100644 --- a/install/debian/8/templates/web/apache2/phpcgi.stpl +++ b/install/debian/8/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/debian/8/templates/web/apache2/phpcgi.tpl b/install/debian/8/templates/web/apache2/phpcgi.tpl index c6796d29c..09cee0ac1 100644 --- a/install/debian/8/templates/web/apache2/phpcgi.tpl +++ b/install/debian/8/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/apache2/phpfcgid.stpl b/install/debian/8/templates/web/apache2/phpfcgid.stpl index 156c8a918..ea57c32aa 100644 --- a/install/debian/8/templates/web/apache2/phpfcgid.stpl +++ b/install/debian/8/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/debian/8/templates/web/apache2/phpfcgid.tpl b/install/debian/8/templates/web/apache2/phpfcgid.tpl index a4c012690..ed799c723 100644 --- a/install/debian/8/templates/web/apache2/phpfcgid.tpl +++ b/install/debian/8/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/debian/8/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/debian/8/templates/web/nginx/caching.stpl +++ b/install/debian/8/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/8/templates/web/nginx/caching.tpl b/install/debian/8/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/debian/8/templates/web/nginx/caching.tpl +++ b/install/debian/8/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/8/templates/web/nginx/default.stpl b/install/debian/8/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/debian/8/templates/web/nginx/default.stpl +++ b/install/debian/8/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/debian/8/templates/web/nginx/default.tpl b/install/debian/8/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/debian/8/templates/web/nginx/default.tpl +++ b/install/debian/8/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/8/templates/web/nginx/hosting.stpl b/install/debian/8/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/debian/8/templates/web/nginx/hosting.stpl +++ b/install/debian/8/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/debian/8/templates/web/nginx/hosting.tpl b/install/debian/8/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/debian/8/templates/web/nginx/hosting.tpl +++ b/install/debian/8/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/httpd/basedir.stpl b/install/rhel/5/templates/web/httpd/basedir.stpl index 4ced9f381..5aa2a865a 100644 --- a/install/rhel/5/templates/web/httpd/basedir.stpl +++ b/install/rhel/5/templates/web/httpd/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/basedir.tpl b/install/rhel/5/templates/web/httpd/basedir.tpl index 566c9884c..76b5b5d6a 100644 --- a/install/rhel/5/templates/web/httpd/basedir.tpl +++ b/install/rhel/5/templates/web/httpd/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/default.stpl b/install/rhel/5/templates/web/httpd/default.stpl index cd4a8c88c..31ddb61cd 100644 --- a/install/rhel/5/templates/web/httpd/default.stpl +++ b/install/rhel/5/templates/web/httpd/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/default.tpl b/install/rhel/5/templates/web/httpd/default.tpl index 94288db02..f877cd906 100644 --- a/install/rhel/5/templates/web/httpd/default.tpl +++ b/install/rhel/5/templates/web/httpd/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/hosting.stpl b/install/rhel/5/templates/web/httpd/hosting.stpl index f94ba1867..1a3ed8fb8 100644 --- a/install/rhel/5/templates/web/httpd/hosting.stpl +++ b/install/rhel/5/templates/web/httpd/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/hosting.tpl b/install/rhel/5/templates/web/httpd/hosting.tpl index 1d3dd354b..24c83fbc4 100644 --- a/install/rhel/5/templates/web/httpd/hosting.tpl +++ b/install/rhel/5/templates/web/httpd/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/phpcgi.stpl b/install/rhel/5/templates/web/httpd/phpcgi.stpl index 591693a42..2ef223531 100644 --- a/install/rhel/5/templates/web/httpd/phpcgi.stpl +++ b/install/rhel/5/templates/web/httpd/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/phpcgi.tpl b/install/rhel/5/templates/web/httpd/phpcgi.tpl index 114c6a52a..dd15efa50 100644 --- a/install/rhel/5/templates/web/httpd/phpcgi.tpl +++ b/install/rhel/5/templates/web/httpd/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/phpfcgid.stpl b/install/rhel/5/templates/web/httpd/phpfcgid.stpl index 3bb82cca3..ebc7f30a3 100644 --- a/install/rhel/5/templates/web/httpd/phpfcgid.stpl +++ b/install/rhel/5/templates/web/httpd/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/httpd/phpfcgid.tpl b/install/rhel/5/templates/web/httpd/phpfcgid.tpl index f4e4f4724..95d43e62d 100644 --- a/install/rhel/5/templates/web/httpd/phpfcgid.tpl +++ b/install/rhel/5/templates/web/httpd/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain_idn%.conf* diff --git a/install/rhel/5/templates/web/nginx/caching.stpl b/install/rhel/5/templates/web/nginx/caching.stpl index 1109c924f..ae1e69297 100755 --- a/install/rhel/5/templates/web/nginx/caching.stpl +++ b/install/rhel/5/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/caching.tpl b/install/rhel/5/templates/web/nginx/caching.tpl index 6d727c67f..fb774a1a8 100755 --- a/install/rhel/5/templates/web/nginx/caching.tpl +++ b/install/rhel/5/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/default.stpl b/install/rhel/5/templates/web/nginx/default.stpl index 53ad8d1b8..52d445b31 100755 --- a/install/rhel/5/templates/web/nginx/default.stpl +++ b/install/rhel/5/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/default.tpl b/install/rhel/5/templates/web/nginx/default.tpl index c1fec114f..e34af0c26 100755 --- a/install/rhel/5/templates/web/nginx/default.tpl +++ b/install/rhel/5/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/hosting.stpl b/install/rhel/5/templates/web/nginx/hosting.stpl index aca458a4b..3a4e0a753 100755 --- a/install/rhel/5/templates/web/nginx/hosting.stpl +++ b/install/rhel/5/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/hosting.tpl b/install/rhel/5/templates/web/nginx/hosting.tpl index 44d874962..d7ffb37b4 100755 --- a/install/rhel/5/templates/web/nginx/hosting.tpl +++ b/install/rhel/5/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/5/wsgi/httpd/wsgi.stpl b/install/rhel/5/wsgi/httpd/wsgi.stpl index e2fdd3f40..3e4e45766 100755 --- a/install/rhel/5/wsgi/httpd/wsgi.stpl +++ b/install/rhel/5/wsgi/httpd/wsgi.stpl @@ -43,7 +43,7 @@ Allow from all - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/5/wsgi/httpd/wsgi.tpl b/install/rhel/5/wsgi/httpd/wsgi.tpl index ad5d8a076..5d80a92b5 100644 --- a/install/rhel/5/wsgi/httpd/wsgi.tpl +++ b/install/rhel/5/wsgi/httpd/wsgi.tpl @@ -38,7 +38,7 @@ Allow from all - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/basedir.stpl b/install/rhel/6/templates/web/httpd/basedir.stpl index 4ced9f381..5aa2a865a 100644 --- a/install/rhel/6/templates/web/httpd/basedir.stpl +++ b/install/rhel/6/templates/web/httpd/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/basedir.tpl b/install/rhel/6/templates/web/httpd/basedir.tpl index 566c9884c..76b5b5d6a 100644 --- a/install/rhel/6/templates/web/httpd/basedir.tpl +++ b/install/rhel/6/templates/web/httpd/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/default.stpl b/install/rhel/6/templates/web/httpd/default.stpl index cd4a8c88c..31ddb61cd 100644 --- a/install/rhel/6/templates/web/httpd/default.stpl +++ b/install/rhel/6/templates/web/httpd/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/default.tpl b/install/rhel/6/templates/web/httpd/default.tpl index 94288db02..f877cd906 100644 --- a/install/rhel/6/templates/web/httpd/default.tpl +++ b/install/rhel/6/templates/web/httpd/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/hosting.stpl b/install/rhel/6/templates/web/httpd/hosting.stpl index f1c1c1111..3d7cb5653 100644 --- a/install/rhel/6/templates/web/httpd/hosting.stpl +++ b/install/rhel/6/templates/web/httpd/hosting.stpl @@ -44,7 +44,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/hosting.tpl b/install/rhel/6/templates/web/httpd/hosting.tpl index 65bf20fd3..c5d52e745 100644 --- a/install/rhel/6/templates/web/httpd/hosting.tpl +++ b/install/rhel/6/templates/web/httpd/hosting.tpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/phpcgi.stpl b/install/rhel/6/templates/web/httpd/phpcgi.stpl index 591693a42..2ef223531 100644 --- a/install/rhel/6/templates/web/httpd/phpcgi.stpl +++ b/install/rhel/6/templates/web/httpd/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/phpcgi.tpl b/install/rhel/6/templates/web/httpd/phpcgi.tpl index 114c6a52a..dd15efa50 100644 --- a/install/rhel/6/templates/web/httpd/phpcgi.tpl +++ b/install/rhel/6/templates/web/httpd/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.stpl b/install/rhel/6/templates/web/httpd/phpfcgid.stpl index 3bb82cca3..ebc7f30a3 100644 --- a/install/rhel/6/templates/web/httpd/phpfcgid.stpl +++ b/install/rhel/6/templates/web/httpd/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.tpl b/install/rhel/6/templates/web/httpd/phpfcgid.tpl index f4e4f4724..95d43e62d 100644 --- a/install/rhel/6/templates/web/httpd/phpfcgid.tpl +++ b/install/rhel/6/templates/web/httpd/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain_idn%.conf* diff --git a/install/rhel/6/templates/web/nginx/caching.stpl b/install/rhel/6/templates/web/nginx/caching.stpl index 1109c924f..ae1e69297 100755 --- a/install/rhel/6/templates/web/nginx/caching.stpl +++ b/install/rhel/6/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/caching.tpl b/install/rhel/6/templates/web/nginx/caching.tpl index 6d727c67f..fb774a1a8 100755 --- a/install/rhel/6/templates/web/nginx/caching.tpl +++ b/install/rhel/6/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/default.stpl b/install/rhel/6/templates/web/nginx/default.stpl index 53ad8d1b8..52d445b31 100755 --- a/install/rhel/6/templates/web/nginx/default.stpl +++ b/install/rhel/6/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/default.tpl b/install/rhel/6/templates/web/nginx/default.tpl index c1fec114f..e34af0c26 100755 --- a/install/rhel/6/templates/web/nginx/default.tpl +++ b/install/rhel/6/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/hosting.stpl b/install/rhel/6/templates/web/nginx/hosting.stpl index aca458a4b..3a4e0a753 100755 --- a/install/rhel/6/templates/web/nginx/hosting.stpl +++ b/install/rhel/6/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/hosting.tpl b/install/rhel/6/templates/web/nginx/hosting.tpl index 44d874962..d7ffb37b4 100755 --- a/install/rhel/6/templates/web/nginx/hosting.tpl +++ b/install/rhel/6/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/6/wsgi/httpd/wsgi.stpl b/install/rhel/6/wsgi/httpd/wsgi.stpl index e2fdd3f40..3e4e45766 100755 --- a/install/rhel/6/wsgi/httpd/wsgi.stpl +++ b/install/rhel/6/wsgi/httpd/wsgi.stpl @@ -43,7 +43,7 @@ Allow from all - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/6/wsgi/httpd/wsgi.tpl b/install/rhel/6/wsgi/httpd/wsgi.tpl index ad5d8a076..5d80a92b5 100644 --- a/install/rhel/6/wsgi/httpd/wsgi.tpl +++ b/install/rhel/6/wsgi/httpd/wsgi.tpl @@ -38,7 +38,7 @@ Allow from all - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/basedir.stpl b/install/rhel/7/templates/web/httpd/basedir.stpl index 952215394..903798dc3 100644 --- a/install/rhel/7/templates/web/httpd/basedir.stpl +++ b/install/rhel/7/templates/web/httpd/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/basedir.tpl b/install/rhel/7/templates/web/httpd/basedir.tpl index e1f86c704..b09d36df1 100644 --- a/install/rhel/7/templates/web/httpd/basedir.tpl +++ b/install/rhel/7/templates/web/httpd/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/default.stpl b/install/rhel/7/templates/web/httpd/default.stpl index c63dd270b..c8cc672fe 100644 --- a/install/rhel/7/templates/web/httpd/default.stpl +++ b/install/rhel/7/templates/web/httpd/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/default.tpl b/install/rhel/7/templates/web/httpd/default.tpl index 558687619..041f22716 100644 --- a/install/rhel/7/templates/web/httpd/default.tpl +++ b/install/rhel/7/templates/web/httpd/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/hosting.stpl b/install/rhel/7/templates/web/httpd/hosting.stpl index 673c9c017..7f17a1994 100644 --- a/install/rhel/7/templates/web/httpd/hosting.stpl +++ b/install/rhel/7/templates/web/httpd/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/hosting.tpl b/install/rhel/7/templates/web/httpd/hosting.tpl index 25f8e3bf9..ee323a8f2 100644 --- a/install/rhel/7/templates/web/httpd/hosting.tpl +++ b/install/rhel/7/templates/web/httpd/hosting.tpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/phpcgi.stpl b/install/rhel/7/templates/web/httpd/phpcgi.stpl index 1f7b3547a..1b9324c00 100644 --- a/install/rhel/7/templates/web/httpd/phpcgi.stpl +++ b/install/rhel/7/templates/web/httpd/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/shttpd.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/shttpd.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/phpcgi.tpl b/install/rhel/7/templates/web/httpd/phpcgi.tpl index c0ae62082..6e7c8f42a 100644 --- a/install/rhel/7/templates/web/httpd/phpcgi.tpl +++ b/install/rhel/7/templates/web/httpd/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/httpd.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/httpd.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.stpl b/install/rhel/7/templates/web/httpd/phpfcgid.stpl index 6d7e81df7..aaf7bcc6b 100644 --- a/install/rhel/7/templates/web/httpd/phpfcgid.stpl +++ b/install/rhel/7/templates/web/httpd/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - IncludeOptional %home%/%user%/conf/web/shttpd.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/shttpd.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.tpl b/install/rhel/7/templates/web/httpd/phpfcgid.tpl index 79d26209b..ddead2e0f 100644 --- a/install/rhel/7/templates/web/httpd/phpfcgid.tpl +++ b/install/rhel/7/templates/web/httpd/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/httpd.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/httpd.%domain_idn%.conf* diff --git a/install/rhel/7/templates/web/nginx/caching.stpl b/install/rhel/7/templates/web/nginx/caching.stpl index 1109c924f..ae1e69297 100755 --- a/install/rhel/7/templates/web/nginx/caching.stpl +++ b/install/rhel/7/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/caching.tpl b/install/rhel/7/templates/web/nginx/caching.tpl index 6d727c67f..fb774a1a8 100755 --- a/install/rhel/7/templates/web/nginx/caching.tpl +++ b/install/rhel/7/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/default.stpl b/install/rhel/7/templates/web/nginx/default.stpl index 53ad8d1b8..52d445b31 100755 --- a/install/rhel/7/templates/web/nginx/default.stpl +++ b/install/rhel/7/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/default.tpl b/install/rhel/7/templates/web/nginx/default.tpl index c1fec114f..e34af0c26 100755 --- a/install/rhel/7/templates/web/nginx/default.tpl +++ b/install/rhel/7/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/hosting.stpl b/install/rhel/7/templates/web/nginx/hosting.stpl index aca458a4b..3a4e0a753 100755 --- a/install/rhel/7/templates/web/nginx/hosting.stpl +++ b/install/rhel/7/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/hosting.tpl b/install/rhel/7/templates/web/nginx/hosting.tpl index 44d874962..d7ffb37b4 100755 --- a/install/rhel/7/templates/web/nginx/hosting.tpl +++ b/install/rhel/7/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/rhel/7/wsgi/httpd/wsgi.stpl b/install/rhel/7/wsgi/httpd/wsgi.stpl index e2fdd3f40..3e4e45766 100755 --- a/install/rhel/7/wsgi/httpd/wsgi.stpl +++ b/install/rhel/7/wsgi/httpd/wsgi.stpl @@ -43,7 +43,7 @@ Allow from all - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/rhel/7/wsgi/httpd/wsgi.tpl b/install/rhel/7/wsgi/httpd/wsgi.tpl index ad5d8a076..5d80a92b5 100644 --- a/install/rhel/7/wsgi/httpd/wsgi.tpl +++ b/install/rhel/7/wsgi/httpd/wsgi.tpl @@ -38,7 +38,7 @@ Allow from all - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl index dda3aa760..a58eefc17 100644 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl index 9449bc447..bac58f258 100644 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/default.stpl b/install/ubuntu/12.04/templates/web/apache2/default.stpl index 269c09711..e9866ef58 100644 --- a/install/ubuntu/12.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/default.tpl b/install/ubuntu/12.04/templates/web/apache2/default.tpl index c24b12796..7f0eacf94 100644 --- a/install/ubuntu/12.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl index 627325e06..d65291db7 100644 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl index 3e30d737b..39f3249ae 100644 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl index aa807091a..1b8fddb5d 100644 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl index fd603800b..d650e2aed 100644 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl index 88cea0e64..996541585 100644 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl index 335b9f620..1f9f912f9 100644 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.stpl b/install/ubuntu/12.04/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/12.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.tpl b/install/ubuntu/12.04/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/12.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/default.stpl b/install/ubuntu/12.04/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/12.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/default.tpl b/install/ubuntu/12.04/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/12.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl index dda3aa760..a58eefc17 100644 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl index 9449bc447..bac58f258 100644 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/default.stpl b/install/ubuntu/12.10/templates/web/apache2/default.stpl index 269c09711..e9866ef58 100644 --- a/install/ubuntu/12.10/templates/web/apache2/default.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/default.tpl b/install/ubuntu/12.10/templates/web/apache2/default.tpl index c24b12796..7f0eacf94 100644 --- a/install/ubuntu/12.10/templates/web/apache2/default.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl index 627325e06..d65291db7 100644 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl index 3e30d737b..39f3249ae 100644 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl index aa807091a..1b8fddb5d 100644 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl index fd603800b..d650e2aed 100644 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl index 88cea0e64..996541585 100644 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl index 335b9f620..1f9f912f9 100644 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.stpl b/install/ubuntu/12.10/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/12.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.tpl b/install/ubuntu/12.10/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/12.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/default.stpl b/install/ubuntu/12.10/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/12.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/default.tpl b/install/ubuntu/12.10/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/12.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl index dda3aa760..a58eefc17 100644 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl index 9449bc447..bac58f258 100644 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/default.stpl b/install/ubuntu/13.04/templates/web/apache2/default.stpl index 269c09711..e9866ef58 100644 --- a/install/ubuntu/13.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/default.tpl b/install/ubuntu/13.04/templates/web/apache2/default.tpl index c24b12796..7f0eacf94 100644 --- a/install/ubuntu/13.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl index ce0763ae8..69866b9ef 100644 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl @@ -44,7 +44,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl index f3491a5fe..ef18dccfd 100644 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl index aa807091a..1b8fddb5d 100644 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl index fd603800b..d650e2aed 100644 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl index 88cea0e64..996541585 100644 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl index 335b9f620..1f9f912f9 100644 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.stpl b/install/ubuntu/13.04/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/13.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.tpl b/install/ubuntu/13.04/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/13.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/default.stpl b/install/ubuntu/13.04/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/13.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/default.tpl b/install/ubuntu/13.04/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/13.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/apache2/basedir.stpl b/install/ubuntu/13.10/templates/web/apache2/basedir.stpl index d978d4c43..cc3596a47 100644 --- a/install/ubuntu/13.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/basedir.tpl b/install/ubuntu/13.10/templates/web/apache2/basedir.tpl index 96c94a1bd..8e4f56913 100644 --- a/install/ubuntu/13.10/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/13.10/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/default.stpl b/install/ubuntu/13.10/templates/web/apache2/default.stpl index a7faa7219..557cb2385 100644 --- a/install/ubuntu/13.10/templates/web/apache2/default.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/default.tpl b/install/ubuntu/13.10/templates/web/apache2/default.tpl index 3a2270156..fe7120146 100644 --- a/install/ubuntu/13.10/templates/web/apache2/default.tpl +++ b/install/ubuntu/13.10/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl index 8892072b1..ba751fe83 100644 --- a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.tpl b/install/ubuntu/13.10/templates/web/apache2/hosting.tpl index 1eb269103..207e0bbe4 100644 --- a/install/ubuntu/13.10/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/13.10/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl index 731355bc1..3c34cf358 100644 --- a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl index c6796d29c..09cee0ac1 100644 --- a/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl index 156c8a918..ea57c32aa 100644 --- a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl index a4c012690..ed799c723 100644 --- a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.stpl b/install/ubuntu/13.10/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/13.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.tpl b/install/ubuntu/13.10/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/13.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/default.stpl b/install/ubuntu/13.10/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/13.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/default.tpl b/install/ubuntu/13.10/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/13.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.stpl b/install/ubuntu/14.04/templates/web/apache2/basedir.stpl index d978d4c43..cc3596a47 100644 --- a/install/ubuntu/14.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.tpl b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl index 96c94a1bd..8e4f56913 100644 --- a/install/ubuntu/14.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/default.stpl b/install/ubuntu/14.04/templates/web/apache2/default.stpl index a7faa7219..557cb2385 100644 --- a/install/ubuntu/14.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/default.tpl b/install/ubuntu/14.04/templates/web/apache2/default.tpl index 3a2270156..fe7120146 100644 --- a/install/ubuntu/14.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/14.04/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl index 8892072b1..ba751fe83 100644 --- a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.tpl b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl index 1eb269103..207e0bbe4 100644 --- a/install/ubuntu/14.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl index 731355bc1..3c34cf358 100644 --- a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl index c6796d29c..09cee0ac1 100644 --- a/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl index 156c8a918..ea57c32aa 100644 --- a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl index a4c012690..ed799c723 100644 --- a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.stpl b/install/ubuntu/14.04/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/14.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.tpl b/install/ubuntu/14.04/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/14.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/default.stpl b/install/ubuntu/14.04/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/14.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/default.tpl b/install/ubuntu/14.04/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/14.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/opencart.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/opencart.tpl index e3669a191..07b0cb90a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/opencart.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/opencart.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/apache2/basedir.stpl b/install/ubuntu/14.10/templates/web/apache2/basedir.stpl index d978d4c43..cc3596a47 100644 --- a/install/ubuntu/14.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/basedir.tpl b/install/ubuntu/14.10/templates/web/apache2/basedir.tpl index 96c94a1bd..8e4f56913 100644 --- a/install/ubuntu/14.10/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/14.10/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/default.stpl b/install/ubuntu/14.10/templates/web/apache2/default.stpl index a7faa7219..557cb2385 100644 --- a/install/ubuntu/14.10/templates/web/apache2/default.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/default.tpl b/install/ubuntu/14.10/templates/web/apache2/default.tpl index 3a2270156..fe7120146 100644 --- a/install/ubuntu/14.10/templates/web/apache2/default.tpl +++ b/install/ubuntu/14.10/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl index 8892072b1..ba751fe83 100644 --- a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.tpl b/install/ubuntu/14.10/templates/web/apache2/hosting.tpl index 1eb269103..207e0bbe4 100644 --- a/install/ubuntu/14.10/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/14.10/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl index 731355bc1..3c34cf358 100644 --- a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl index c6796d29c..09cee0ac1 100644 --- a/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl index 156c8a918..ea57c32aa 100644 --- a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl index a4c012690..ed799c723 100644 --- a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.stpl b/install/ubuntu/14.10/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/14.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.tpl b/install/ubuntu/14.10/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/14.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/default.stpl b/install/ubuntu/14.10/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/14.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/default.tpl b/install/ubuntu/14.10/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/14.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/apache2/basedir.stpl b/install/ubuntu/15.04/templates/web/apache2/basedir.stpl index d978d4c43..cc3596a47 100644 --- a/install/ubuntu/15.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/basedir.tpl b/install/ubuntu/15.04/templates/web/apache2/basedir.tpl index 96c94a1bd..8e4f56913 100644 --- a/install/ubuntu/15.04/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/15.04/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/default.stpl b/install/ubuntu/15.04/templates/web/apache2/default.stpl index a7faa7219..557cb2385 100644 --- a/install/ubuntu/15.04/templates/web/apache2/default.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/default.tpl b/install/ubuntu/15.04/templates/web/apache2/default.tpl index 3a2270156..fe7120146 100644 --- a/install/ubuntu/15.04/templates/web/apache2/default.tpl +++ b/install/ubuntu/15.04/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl index 8892072b1..ba751fe83 100644 --- a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.tpl b/install/ubuntu/15.04/templates/web/apache2/hosting.tpl index 1eb269103..207e0bbe4 100644 --- a/install/ubuntu/15.04/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/15.04/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl index 731355bc1..3c34cf358 100644 --- a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl index c6796d29c..09cee0ac1 100644 --- a/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl index 156c8a918..ea57c32aa 100644 --- a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl index a4c012690..ed799c723 100644 --- a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.stpl b/install/ubuntu/15.04/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/15.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.tpl b/install/ubuntu/15.04/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/15.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/default.stpl b/install/ubuntu/15.04/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/15.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/default.tpl b/install/ubuntu/15.04/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/15.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl index d978d4c43..cc3596a47 100644 --- a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl @@ -38,7 +38,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.tpl b/install/ubuntu/15.10/templates/web/apache2/basedir.tpl index 96c94a1bd..8e4f56913 100644 --- a/install/ubuntu/15.10/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/15.10/templates/web/apache2/basedir.tpl @@ -32,7 +32,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/default.stpl b/install/ubuntu/15.10/templates/web/apache2/default.stpl index a7faa7219..557cb2385 100644 --- a/install/ubuntu/15.10/templates/web/apache2/default.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/default.stpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/default.tpl b/install/ubuntu/15.10/templates/web/apache2/default.tpl index 3a2270156..fe7120146 100644 --- a/install/ubuntu/15.10/templates/web/apache2/default.tpl +++ b/install/ubuntu/15.10/templates/web/apache2/default.tpl @@ -31,7 +31,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl index 8892072b1..ba751fe83 100644 --- a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl @@ -43,7 +43,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.tpl b/install/ubuntu/15.10/templates/web/apache2/hosting.tpl index 1eb269103..207e0bbe4 100644 --- a/install/ubuntu/15.10/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/15.10/templates/web/apache2/hosting.tpl @@ -37,7 +37,7 @@ AssignUserID %user% %group% - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl index 731355bc1..3c34cf358 100644 --- a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl @@ -32,7 +32,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl index c6796d29c..09cee0ac1 100644 --- a/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl +++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl index 156c8a918..ea57c32aa 100644 --- a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl @@ -33,7 +33,7 @@ SSLCertificateKeyFile %ssl_key% %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* diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl index a4c012690..ed799c723 100644 --- a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl +++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl @@ -25,7 +25,7 @@ AllowOverride All - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* + IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf* diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.stpl b/install/ubuntu/15.10/templates/web/nginx/caching.stpl index ca6cffe32..276807f28 100755 --- a/install/ubuntu/15.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.tpl b/install/ubuntu/15.10/templates/web/nginx/caching.tpl index 36761b65c..9bb2fdd1d 100755 --- a/install/ubuntu/15.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/default.stpl b/install/ubuntu/15.10/templates/web/nginx/default.stpl index fa5380606..55bc285ca 100755 --- a/install/ubuntu/15.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/default.stpl @@ -31,6 +31,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/default.tpl b/install/ubuntu/15.10/templates/web/nginx/default.tpl index 4d5c774bc..79cf7680b 100755 --- a/install/ubuntu/15.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/default.tpl @@ -28,6 +28,6 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl index d778d6333..40b8c289b 100755 --- a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl @@ -33,6 +33,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/snginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl index 15961c95c..4e428a9e3 100755 --- a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl @@ -30,6 +30,6 @@ server { disable_symlinks if_not_owner from=%docroot%; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl index b19fdeaa0..e6633edee 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl index 06353a477..663ef0bc0 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/cms_made_simple.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl index b1491edfc..821534bef 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -57,5 +57,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl index 1ed1e6490..fa61e8dd3 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter2.tpl @@ -53,5 +53,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl index 8723a0e75..d4a69b9b5 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -52,5 +52,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl index d5281dc92..6c62cd483 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/codeigniter3.tpl @@ -48,5 +48,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl index 9e7720bf5..77f185076 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -123,5 +123,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl index d09b587e6..4e16945bd 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/datalife_engine.tpl @@ -119,5 +119,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl index 7fade11b7..cc10cbe10 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/default.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl index f0669d6f0..41b70e918 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -68,5 +68,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl index ba854768a..bf4b30513 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl index 13c17ecb3..b240b2e0e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl index 55dde0137..b70101377 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal6.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl index 6e8d89fa1..6f150bf12 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.stpl @@ -97,5 +97,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl index c5d737eaa..a4376141c 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal7.tpl @@ -94,5 +94,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl index 902f6fdb3..e234feee9 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.stpl @@ -98,5 +98,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl index 2100f9346..e564b5f3b 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/drupal8.tpl @@ -95,5 +95,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl index 6105b2c33..09a73c83f 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.stpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl index 9d46116ac..8b4565e19 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/joomla.tpl @@ -55,5 +55,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl index 54fab2b1e..ddd87f3e1 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl index b3c3e3509..b37583d09 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl @@ -61,5 +61,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl index 7f16b0ddd..2ad2cac5d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.stpl @@ -86,5 +86,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl index 49ea28696..7fc741b68 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/moodle.tpl @@ -83,5 +83,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl index f49a4a5b0..9d40c9eda 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.stpl @@ -43,5 +43,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl index 3e796d1e3..af6f8597a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/no-php.tpl @@ -39,5 +39,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl index 8cf16b07c..5831d44b3 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.stpl @@ -81,5 +81,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl index e33332e03..0cc951770 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/owncloud.tpl @@ -82,5 +82,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl index 877db95ac..1da13092e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.stpl @@ -69,5 +69,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl index 253fe87bf..b52d29a2d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/piwik.tpl @@ -65,5 +65,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl index 2e5d9c8dd..ea52172fc 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -62,5 +62,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl index 4b2ec7884..e345e871a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -58,5 +58,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl index a43dbe82a..12182544d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.stpl @@ -51,5 +51,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl index dbd38c077..857135799 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress.tpl @@ -47,5 +47,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl index 80fd787ac..da5b75e5c 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -63,5 +63,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl index 54e1c7553..d1350ed80 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/wordpress2.tpl @@ -59,5 +59,5 @@ server { include /etc/nginx/conf.d/phppgadmin.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*; }