Fix statistics authorization file path in PHP-FPM templates

Kristan Kenney · Kristan Kenney · commit a548f60853c5 · 2019-05-11T11:35:48.000-03:00
diff --git a/install/deb/multiphp/nginx/PHP-56.stpl b/install/deb/multiphp/nginx/PHP-56.stpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-56.tpl b/install/deb/multiphp/nginx/PHP-56.tpl
@@ -42,7 +42,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-70.stpl b/install/deb/multiphp/nginx/PHP-70.stpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-70.tpl b/install/deb/multiphp/nginx/PHP-70.tpl
@@ -42,7 +42,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-71.stpl b/install/deb/multiphp/nginx/PHP-71.stpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-71.tpl b/install/deb/multiphp/nginx/PHP-71.tpl
@@ -42,7 +42,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-72.stpl b/install/deb/multiphp/nginx/PHP-72.stpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-72.tpl b/install/deb/multiphp/nginx/PHP-72.tpl
@@ -42,7 +42,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-73.stpl b/install/deb/multiphp/nginx/PHP-73.stpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/multiphp/nginx/PHP-73.tpl b/install/deb/multiphp/nginx/PHP-73.tpl
@@ -42,7 +42,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -44,7 +44,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/deb/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -49,7 +49,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -48,7 +48,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/deb/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -44,7 +44,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -115,7 +115,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -114,7 +114,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/default.stpl b/install/deb/templates/web/nginx/php-fpm/default.stpl
@@ -43,7 +43,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/default.tpl b/install/deb/templates/web/nginx/php-fpm/default.tpl
@@ -42,7 +42,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -60,7 +60,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -58,7 +58,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal6.stpl b/install/deb/templates/web/nginx/php-fpm/drupal6.stpl
@@ -83,7 +83,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal6.tpl b/install/deb/templates/web/nginx/php-fpm/drupal6.tpl
@@ -82,7 +82,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal7.stpl b/install/deb/templates/web/nginx/php-fpm/drupal7.stpl
@@ -83,7 +83,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal7.tpl b/install/deb/templates/web/nginx/php-fpm/drupal7.tpl
@@ -82,7 +82,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal8.stpl b/install/deb/templates/web/nginx/php-fpm/drupal8.stpl
@@ -83,7 +83,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/drupal8.tpl b/install/deb/templates/web/nginx/php-fpm/drupal8.tpl
@@ -82,7 +82,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/joomla.stpl b/install/deb/templates/web/nginx/php-fpm/joomla.stpl
@@ -51,7 +51,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/joomla.tpl b/install/deb/templates/web/nginx/php-fpm/joomla.tpl
@@ -50,7 +50,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/laravel.stpl b/install/deb/templates/web/nginx/php-fpm/laravel.stpl
@@ -44,7 +44,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/laravel.tpl b/install/deb/templates/web/nginx/php-fpm/laravel.tpl
@@ -41,7 +41,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/magento.stpl b/install/deb/templates/web/nginx/php-fpm/magento.stpl
@@ -186,7 +186,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/magento.tpl b/install/deb/templates/web/nginx/php-fpm/magento.tpl
@@ -185,7 +185,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/modx.stpl b/install/deb/templates/web/nginx/php-fpm/modx.stpl
@@ -57,7 +57,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/modx.tpl b/install/deb/templates/web/nginx/php-fpm/modx.tpl
@@ -56,7 +56,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/moodle.stpl b/install/deb/templates/web/nginx/php-fpm/moodle.stpl
@@ -78,7 +78,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/moodle.tpl b/install/deb/templates/web/nginx/php-fpm/moodle.tpl
@@ -78,7 +78,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/no-php.stpl b/install/deb/templates/web/nginx/php-fpm/no-php.stpl
@@ -35,7 +35,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/no-php.tpl b/install/deb/templates/web/nginx/php-fpm/no-php.tpl
@@ -34,7 +34,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/odoo.stpl b/install/deb/templates/web/nginx/php-fpm/odoo.stpl
@@ -58,7 +58,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/odoo.tpl b/install/deb/templates/web/nginx/php-fpm/odoo.tpl
@@ -57,7 +57,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     include     /etc/nginx/conf.d/phpmyadmin.inc*;
diff --git a/install/deb/templates/web/nginx/php-fpm/opencart.stpl b/install/deb/templates/web/nginx/php-fpm/opencart.stpl
@@ -34,7 +34,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     error_page  403 /error/404.html;
diff --git a/install/deb/templates/web/nginx/php-fpm/opencart.tpl b/install/deb/templates/web/nginx/php-fpm/opencart.tpl
@@ -32,7 +32,7 @@ server {
 
     location /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
-        include %home%/%user%/conf/web/%domain%.auth*;
+        include %home%/%user%/web/%domain%/stats/auth.conf*;
     }
 
     error_page  403 /error/404.html;
diff --git a/install/deb/templates/web/nginx/php-fpm/owncloud.stpl b/install/deb/templates/web/nginx/php-fpm/owncloud.stpl
diff --git a/install/deb/templates/web/nginx/php-fpm/owncloud.tpl b/install/deb/templates/web/nginx/php-fpm/owncloud.tpl
diff --git a/install/deb/templates/web/nginx/php-fpm/piwik.stpl b/install/deb/templates/web/nginx/php-fpm/piwik.stpl
diff --git a/install/deb/templates/web/nginx/php-fpm/piwik.tpl b/install/deb/templates/web/nginx/php-fpm/piwik.tpl
diff --git a/install/deb/templates/web/nginx/php-fpm/pyrocms.stpl b/install/deb/templates/web/nginx/php-fpm/pyrocms.stpl
diff --git a/install/deb/templates/web/nginx/php-fpm/pyrocms.tpl b/install/deb/templates/web/nginx/php-fpm/pyrocms.tpl

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ server {`
`43`	`43`
`44`	`44`	`location /vstats/ {`
`45`	`45`	`alias %home%/%user%/web/%domain%/stats/;`
`46`		`- include %home%/%user%/conf/web/%domain%.auth*;`
	`46`	`+ include %home%/%user%/web/%domain%/stats/auth.conf*;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`include /etc/nginx/conf.d/phpmyadmin.inc*;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ server {`
`42`	`42`
`43`	`43`	`location /vstats/ {`
`44`	`44`	`alias %home%/%user%/web/%domain%/stats/;`
`45`		`- include %home%/%user%/conf/web/%domain%.auth*;`
	`45`	`+ include %home%/%user%/web/%domain%/stats/auth.conf*;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`include /etc/nginx/conf.d/phpmyadmin.inc*;`