Просмотр исходного кода

awstats/webalized fix for php-fpm systems

Serghey Rodin 9 лет назад
Родитель
Сommit
44be086dfc
100 измененных файлов с 583 добавлено и 44 удалено
  1. 15 9
      bin/v-add-web-domain-stats-user
  2. 10 4
      func/rebuild.sh
  3. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl
  4. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl
  5. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl
  6. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl
  7. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl
  8. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl
  9. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl
  10. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl
  11. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/default.stpl
  12. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/default.tpl
  13. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl
  14. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl
  15. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl
  16. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl
  17. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl
  18. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl
  19. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl
  20. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl
  21. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl
  22. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl
  23. 12 7
      install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
  24. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
  25. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl
  26. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl
  27. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
  28. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
  29. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl
  30. 10 0
      install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl
  31. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl
  32. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl
  33. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
  34. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
  35. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl
  36. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl
  37. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl
  38. 5 0
      install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl
  39. 0 10
      install/debian/7/templates/web/nginx/php5-fpm/www.conf
  40. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl
  41. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl
  42. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl
  43. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl
  44. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl
  45. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl
  46. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl
  47. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl
  48. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/default.stpl
  49. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/default.tpl
  50. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl
  51. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl
  52. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl
  53. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl
  54. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl
  55. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl
  56. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl
  57. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl
  58. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl
  59. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl
  60. 12 7
      install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
  61. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
  62. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl
  63. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl
  64. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
  65. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
  66. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl
  67. 10 0
      install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl
  68. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl
  69. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl
  70. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
  71. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
  72. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl
  73. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl
  74. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl
  75. 5 0
      install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl
  76. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl
  77. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl
  78. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl
  79. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl
  80. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl
  81. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl
  82. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl
  83. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl
  84. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/default.stpl
  85. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/default.tpl
  86. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl
  87. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl
  88. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl
  89. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl
  90. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl
  91. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl
  92. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl
  93. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl
  94. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl
  95. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl
  96. 12 7
      install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
  97. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
  98. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl
  99. 5 0
      install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl
  100. 47 0
      install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl

+ 15 - 9
bin/v-add-web-domain-stats-user

@@ -11,7 +11,7 @@
 
 # Argument definition
 user=$1
-domain=$(idn -t --quiet -u "$2" )
+domain=$2
 stats_user=$3
 password=$4; HIDE=4
 
@@ -43,15 +43,21 @@ is_password_valid
 stats_dir="$HOMEDIR/$user/web/$domain/stats"
 
 # Adding htaccess file
-echo "AuthUserFile $stats_dir/.htpasswd
-AuthName \"Web Statistics\"
-AuthType Basic
-Require valid-user" > $stats_dir/.htaccess
+if [ "$WEB_SYSTEM" = 'nginx' ]; then
+    echo "auth_basic \"Web Statistics\";" > $stats_dir/auth.conf
+    echo "auth_basic_user_file $stats_dir/.htpasswd;" >> $stats_dir/auth.conf
+else
+    echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess
+    echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess
+    echo "AuthType Basic" >> $stats_dir/.htaccess
+    echo "Require valid-user" >> $stats_dir/.htaccess
+fi
 
 # Generating htaccess user and password
-rm -f $stats_dir/.htpasswd
-htpasswd -bc $stats_dir/.htpasswd "$stats_user" "$password" &>/dev/null
-stats_crypt=$(grep $stats_user: $stats_dir/.htpasswd |cut -f 2 -d :)
+salt=$(generate_password "$PW_MATRIX" "8")
+stats_pass=$($BIN/v-generate-password-hash md5 $salt $password)
+echo "$stats_user:$stats_pass" > $stats_dir/.htpasswd
+
 
 #----------------------------------------------------------#
 #                       Vesta                              #
@@ -59,7 +65,7 @@ stats_crypt=$(grep $stats_user: $stats_dir/.htpasswd |cut -f 2 -d :)
 
 # Adding stats user in config
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS_USER' "$stats_user"
-update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_crypt"
+update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' "$stats_pass"
 
 # Logging
 log_history "added password protection for web stats on $domain"

+ 10 - 4
func/rebuild.sh

@@ -252,10 +252,16 @@ rebuild_web_domain_conf() {
 
         if [ ! -z "$STATS_USER" ]; then
             stats_dir="$HOMEDIR/$user/web/$domain/stats"
-            echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess
-            echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess
-            echo "AuthType Basic" >> $stats_dir/.htaccess
-            echo "Require valid-user" >> $stats_dir/.htaccess
+            if [ "$WEB_SYSTEM" = 'nginx' ]; then
+                echo "auth_basic \"Web Statistics\";" > $stats_dir/auth.conf
+                echo "auth_basic_user_file $stats_dir/.htpasswd;" >> \
+                    $stats_dir/auth.conf
+            else
+                echo "AuthUserFile $stats_dir/.htpasswd" > $stats_dir/.htaccess
+                echo "AuthName \"Web Statistics\"" >> $stats_dir/.htaccess
+                echo "AuthType Basic" >> $stats_dir/.htaccess
+                echo "Require valid-user" >> $stats_dir/.htaccess
+            fi
             echo "$STATS_USER:$STATS_CRYPT" > $stats_dir/.htpasswd
         fi
     fi

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

@@ -43,6 +43,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -39,6 +39,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -48,6 +48,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

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

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

@@ -43,6 +43,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -39,6 +39,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -114,6 +114,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -110,6 +110,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -42,6 +42,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/default.tpl

@@ -38,6 +38,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl

@@ -59,6 +59,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl

@@ -54,6 +54,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl

@@ -88,6 +88,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl

@@ -85,6 +85,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl

@@ -88,6 +88,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl

@@ -85,6 +85,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl

@@ -89,6 +89,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl

@@ -86,6 +86,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl

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

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl

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

+ 12 - 7
install/debian/7/templates/web/nginx/php5-fpm/modx.stpl

@@ -35,13 +35,13 @@ server {
         rewrite ^/(.*)$ /index.php?q=$1;
     }
 
-	location ~ \.php$ {
-        	try_files $uri =404;
-            fastcgi_pass %backend_lsnr%;
-            fastcgi_index index.php;
-		    fastcgi_param SCRIPT_FILENAME $request_filename;
-            include /etc/nginx/fastcgi_params;
-        }
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
 
     error_page  403 /error/404.html;
     error_page  404 /error/404.html;
@@ -56,6 +56,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/modx.tpl

@@ -52,6 +52,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl

@@ -77,6 +77,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl

@@ -74,6 +74,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl

@@ -34,6 +34,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl

@@ -30,6 +30,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl

@@ -72,6 +72,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

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

@@ -68,6 +68,16 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl

@@ -60,6 +60,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl

@@ -56,6 +56,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl

@@ -53,6 +53,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl

@@ -49,6 +49,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl

@@ -42,6 +42,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl

@@ -38,6 +38,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl

@@ -54,6 +54,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl

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

+ 0 - 10
install/debian/7/templates/web/nginx/php5-fpm/www.conf

@@ -1,10 +0,0 @@
-[www]
-listen = 127.0.0.1:9000
-listen.allowed_clients = 127.0.0.1
-user = www-data
-group = www-data
-pm = dynamic
-pm.max_children = 50
-pm.start_servers = 5
-pm.min_spare_servers = 3
-pm.max_spare_servers = 35

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl

@@ -43,6 +43,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl

@@ -39,6 +39,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl

@@ -48,6 +48,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl

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

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl

@@ -43,6 +43,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl

@@ -39,6 +39,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl

@@ -114,6 +114,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl

@@ -110,6 +110,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/default.stpl

@@ -42,6 +42,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/default.tpl

@@ -38,6 +38,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl

@@ -59,6 +59,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl

@@ -54,6 +54,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl

@@ -88,6 +88,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl

@@ -85,6 +85,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl

@@ -88,6 +88,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl

@@ -85,6 +85,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl

@@ -89,6 +89,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl

@@ -86,6 +86,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl

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

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl

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

+ 12 - 7
install/debian/8/templates/web/nginx/php5-fpm/modx.stpl

@@ -35,13 +35,13 @@ server {
         rewrite ^/(.*)$ /index.php?q=$1;
     }
 
-	location ~ \.php$ {
-        	try_files $uri =404;
-            fastcgi_pass %backend_lsnr%;
-            fastcgi_index index.php;
-		    fastcgi_param SCRIPT_FILENAME $request_filename;
-            include /etc/nginx/fastcgi_params;
-        }
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
 
     error_page  403 /error/404.html;
     error_page  404 /error/404.html;
@@ -56,6 +56,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/modx.tpl

@@ -52,6 +52,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl

@@ -77,6 +77,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl

@@ -74,6 +74,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl

@@ -34,6 +34,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl

@@ -30,6 +30,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl

@@ -72,6 +72,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 10 - 0
install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl

@@ -68,6 +68,16 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl

@@ -60,6 +60,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl

@@ -56,6 +56,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl

@@ -53,6 +53,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl

@@ -49,6 +49,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl

@@ -42,6 +42,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl

@@ -38,6 +38,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl

@@ -54,6 +54,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl

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

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -43,6 +43,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -39,6 +39,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -48,6 +48,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl

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

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl

@@ -43,6 +43,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl

@@ -39,6 +39,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -114,6 +114,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl

@@ -110,6 +110,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/default.stpl

@@ -42,6 +42,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/default.tpl

@@ -38,6 +38,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -59,6 +59,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl

@@ -54,6 +54,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl

@@ -88,6 +88,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl

@@ -85,6 +85,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl

@@ -88,6 +88,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl

@@ -85,6 +85,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl

@@ -89,6 +89,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl

@@ -86,6 +86,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl

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

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl

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

+ 12 - 7
install/rhel/5/templates/web/nginx/php-fpm/modx.stpl

@@ -35,13 +35,13 @@ server {
         rewrite ^/(.*)$ /index.php?q=$1;
     }
 
-	location ~ \.php$ {
-        	try_files $uri =404;
-            fastcgi_pass %backend_lsnr%;
-            fastcgi_index index.php;
-		    fastcgi_param SCRIPT_FILENAME $request_filename;
-            include /etc/nginx/fastcgi_params;
-        }
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
 
     error_page  403 /error/404.html;
     error_page  404 /error/404.html;
@@ -56,6 +56,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/modx.tpl

@@ -52,6 +52,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl

@@ -77,6 +77,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 5 - 0
install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl

@@ -74,6 +74,11 @@ server {
         return  404;
     }
 
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;

+ 47 - 0
install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl

@@ -0,0 +1,47 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    types {
+            text/html   html htm shtml php php5;
+    }
+
+    location / {
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}

Некоторые файлы не были показаны из-за большого количества измененных файлов