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

Author: Serghey Rodin

bin/v-restart-web-backend

@@ -50,7 +50,7 @@ if [ -z "$WEB_BACKEND" ] || [ "$WEB_BACKEND" = 'remote' ]; then
 fi
 
 # Restart system
-php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d /)
+php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d / |head -n1)
 if [ -z "$php_fpm" ]; then
     service $WEB_BACKEND restart >/dev/null 2>&1
 else

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

@@ -45,7 +45,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -41,7 +41,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -50,7 +50,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -46,7 +46,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -45,7 +45,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -41,7 +41,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -116,7 +116,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -112,7 +112,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;

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

@@ -44,7 +44,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth
+        include %home%/%user%/conf/web/%domain%.auth*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;