Merge branch 'master' of github.com:serghey-rodin/vesta

bin/v-backup-user

@@ -508,7 +508,6 @@ local_backup(){
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$BACKUPS" -le "$backups_count" ]; then
         backups_rm_number=$((backups_count - BACKUPS))
-        (( ++backups_rm_number))
 
         # Removing old backup
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
@@ -624,7 +623,7 @@ ftp_backup() {
     fi
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$backups_count" -ge "$BACKUPS" ]; then
-        backups_rm_number=$((backups_count - BACKUPS + 1))
+        backups_rm_number=$((backups_count - BACKUPS))
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do 
             backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//")
             echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\
@@ -779,7 +778,7 @@ sftp_backup() {
     fi
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$backups_count" -ge "$BACKUPS" ]; then
-        backups_rm_number=$((backups_count - BACKUPS + 1))
+        backups_rm_number=$((backups_count - BACKUPS))
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
             backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//")
             echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\
@@ -828,7 +827,7 @@ google_backup() {
     backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2>/dev/null)
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$backups_count" -ge "$BACKUPS" ]; then
-        backups_rm_number=$((backups_count - BACKUPS + 1))
+        backups_rm_number=$((backups_count - BACKUPS))
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do 
             echo -e "$(date "+%F %T") Roated gcp backup: $backup"
             $gsutil rm $backup > /dev/null 2>&1

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

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

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

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

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

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

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

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

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

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

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

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

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_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

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

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

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_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

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

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

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/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

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_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

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_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

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_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/7/templates/web/nginx/php5-fpm/laravel.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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl

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

install/debian/7/templates/web/nginx/php5-fpm/magento.stpl

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

install/debian/7/templates/web/nginx/php5-fpm/magento.tpl

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

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl

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

install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl

@@ -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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/7/templates/web/nginx/php5-fpm/opencart.tpl

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

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl

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

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/8/templates/web/apache2/basedir.stpl

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

install/debian/8/templates/web/apache2/basedir.tpl

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

install/debian/8/templates/web/apache2/default.stpl

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

install/debian/8/templates/web/apache2/default.tpl

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

install/debian/8/templates/web/apache2/hosting.stpl

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

install/debian/8/templates/web/apache2/hosting.tpl

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

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_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/debian/8/templates/web/apache2/phpcgi.tpl

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

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_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/debian/8/templates/web/apache2/phpfcgid.tpl

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

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/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

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_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

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_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

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_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

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_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }

install/debian/8/templates/web/nginx/php5-fpm/laravel.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/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }

install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl

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

install/debian/8/templates/web/nginx/php5-fpm/magento.stpl

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

install/debian/8/templates/web/nginx/php5-fpm/magento.tpl

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