diff --git a/install/debian/7/templates/web/apache2/basedir.stpl b/install/debian/7/templates/web/apache2/basedir.stpl index dda3aa76..a58eefc1 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 9449bc44..bac58f25 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 269c0971..e9866ef5 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 c24b1279..7f0eacf9 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 627325e0..d65291db 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 0bdd6ea6..ba702184 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 aa807091..1b8fddb5 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 fd603800..d650e2ae 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 88cea0e6..99654158 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 335b9f62..1f9f912f 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 d978d4c4..cc3596a4 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 96c94a1b..8e4f5691 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 a7faa721..557cb238 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 3a227015..fe712014 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 8892072b..ba751fe8 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 1eb26910..207e0bbe 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 731355bc..3c34cf35 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 c6796d29..09cee0ac 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 156c8a91..ea57c32a 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 a4c01269..ed799c72 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 4ced9f38..5aa2a865 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 566c9884..76b5b5d6 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 cd4a8c88..31ddb61c 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 94288db0..f877cd90 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 f94ba186..1a3ed8fb 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 1d3dd354..24c83fbc 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 591693a4..2ef22353 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 114c6a52..dd15efa5 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 3bb82cca..ebc7f30a 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 f4e4f472..95d43e62 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 1109c924..ae1e6929 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 6d727c67..fb774a1a 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 53ad8d1b..52d445b3 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 c1fec114..e34af0c2 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 aca458a4..3a4e0a75 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 44d87496..d7ffb37b 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 e2fdd3f4..3e4e4576 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 ad5d8a07..5d80a92b 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 4ced9f38..5aa2a865 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 566c9884..76b5b5d6 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 cd4a8c88..31ddb61c 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 94288db0..f877cd90 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 f1c1c111..3d7cb565 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 65bf20fd..c5d52e74 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 591693a4..2ef22353 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 114c6a52..dd15efa5 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 3bb82cca..ebc7f30a 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 f4e4f472..95d43e62 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 1109c924..ae1e6929 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 6d727c67..fb774a1a 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 53ad8d1b..52d445b3 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 c1fec114..e34af0c2 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 aca458a4..3a4e0a75 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 44d87496..d7ffb37b 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 e2fdd3f4..3e4e4576 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 ad5d8a07..5d80a92b 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 95221539..903798dc 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 e1f86c70..b09d36df 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 c63dd270..c8cc672f 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 55868761..041f2271 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 673c9c01..7f17a199 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 25f8e3bf..ee323a8f 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 1f7b3547..1b9324c0 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 c0ae6208..6e7c8f42 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 6d7e81df..aaf7bcc6 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 79d26209..ddead2e0 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 1109c924..ae1e6929 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 6d727c67..fb774a1a 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 53ad8d1b..52d445b3 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 c1fec114..e34af0c2 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 aca458a4..3a4e0a75 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 44d87496..d7ffb37b 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 e2fdd3f4..3e4e4576 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 ad5d8a07..5d80a92b 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 dda3aa76..a58eefc1 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 9449bc44..bac58f25 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 269c0971..e9866ef5 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 c24b1279..7f0eacf9 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 627325e0..d65291db 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 3e30d737..39f3249a 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 aa807091..1b8fddb5 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 fd603800..d650e2ae 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 88cea0e6..99654158 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 335b9f62..1f9f912f 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 dda3aa76..a58eefc1 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 9449bc44..bac58f25 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 269c0971..e9866ef5 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 c24b1279..7f0eacf9 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 627325e0..d65291db 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 3e30d737..39f3249a 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 aa807091..1b8fddb5 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 fd603800..d650e2ae 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 88cea0e6..99654158 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 335b9f62..1f9f912f 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 dda3aa76..a58eefc1 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 9449bc44..bac58f25 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 269c0971..e9866ef5 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 c24b1279..7f0eacf9 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 ce0763ae..69866b9e 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 f3491a5f..ef18dccf 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 aa807091..1b8fddb5 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 fd603800..d650e2ae 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 88cea0e6..99654158 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 335b9f62..1f9f912f 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 d978d4c4..cc3596a4 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 96c94a1b..8e4f5691 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 a7faa721..557cb238 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 3a227015..fe712014 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 8892072b..ba751fe8 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 1eb26910..207e0bbe 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 731355bc..3c34cf35 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 c6796d29..09cee0ac 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 156c8a91..ea57c32a 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 a4c01269..ed799c72 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 d978d4c4..cc3596a4 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 96c94a1b..8e4f5691 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 a7faa721..557cb238 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 3a227015..fe712014 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 8892072b..ba751fe8 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 1eb26910..207e0bbe 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 731355bc..3c34cf35 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 c6796d29..09cee0ac 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 156c8a91..ea57c32a 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 a4c01269..ed799c72 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 e3669a19..07b0cb90 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 d978d4c4..cc3596a4 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 96c94a1b..8e4f5691 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 a7faa721..557cb238 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 3a227015..fe712014 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 8892072b..ba751fe8 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 1eb26910..207e0bbe 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 731355bc..3c34cf35 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 c6796d29..09cee0ac 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 156c8a91..ea57c32a 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 a4c01269..ed799c72 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 d978d4c4..cc3596a4 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 96c94a1b..8e4f5691 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 a7faa721..557cb238 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 3a227015..fe712014 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 8892072b..ba751fe8 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 1eb26910..207e0bbe 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 731355bc..3c34cf35 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 c6796d29..09cee0ac 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 156c8a91..ea57c32a 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 a4c01269..ed799c72 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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 d978d4c4..cc3596a4 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 96c94a1b..8e4f5691 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 a7faa721..557cb238 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 3a227015..fe712014 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 8892072b..ba751fe8 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 1eb26910..207e0bbe 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 731355bc..3c34cf35 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 c6796d29..09cee0ac 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 156c8a91..ea57c32a 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 a4c01269..ed799c72 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 ca6cffe3..276807f2 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 36761b65..9bb2fdd1 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 fa538060..55bc285c 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 4d5c774b..79cf7680 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 d778d633..40b8c289 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 15961c95..4e428a9e 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 b19fdeaa..e6633ede 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 06353a47..663ef0bc 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 b1491edf..821534be 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 1ed1e649..fa61e8dd 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 8723a0e7..d4a69b9b 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 d5281dc9..6c62cd48 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 9e7720bf..77f18507 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 d09b587e..4e16945b 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 7fade11b..cc10cbe1 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 dbd38c07..85713579 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 f0669d6f..41b70e91 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 ba854768..bf4b3051 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 13c17ecb..b240b2e0 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 55dde013..b7010137 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 6e8d89fa..6f150bf1 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 c5d737ea..a4376141 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 902f6fdb..e234feee 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 2100f934..e564b5f3 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 6105b2c3..09a73c83 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 9d46116a..8b4565e1 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 54fab2b1..ddd87f3e 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 b3c3e350..b37583d0 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 7f16b0dd..2ad2cac5 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 49ea2869..7fc741b6 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 f49a4a5b..9d40c9ed 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 3e796d1e..af6f8597 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 8cf16b07..5831d44b 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 e33332e0..0cc95177 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 877db95a..1da13092 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 253fe87b..b52d29a2 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 2e5d9c8d..ea52172f 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 4b2ec788..e345e871 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 a43dbe82..12182544 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 dbd38c07..85713579 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 80fd787a..da5b75e5 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 54e1c755..d1350ed8 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*; }