Merge branch 'RavanH-status-ping' into develop

mbtamuli · mbtamuli · commit 7f80e796951f · 2018-05-29T13:39:37.000+05:30
diff --git a/ee/cli/templates/locations-php7.mustache b/ee/cli/templates/locations-php7.mustache
@@ -41,28 +41,28 @@ if ($uri ~* "^.+(readme|license|example)\.(txt|html)$") {
   return 403;
 }
 # Status pages
-location /nginx_status {
+location = /nginx_status {
   stub_status on;
   access_log off;
   include common/acl.conf;
 }
-location ~ ^/(status|ping) {
+location ~ ^/(status|ping)$ {
   include fastcgi_params;
   fastcgi_pass php7;
   include common/acl.conf;
 }
 # EasyEngine (ee) utilities
 # phpMyAdmin settings
-location /pma {
+location = /pma {
   return 301 https://$host:22222/db/pma;
 }
-location /phpMyAdmin {
+location = /phpMyAdmin {
   return 301 https://$host:22222/db/pma;
 }
-location /phpmyadmin {
+location = /phpmyadmin {
   return 301 https://$host:22222/db/pma;
 }
 # Adminer settings
-location /adminer {
+location = /adminer {
   return 301 https://$host:22222/db/adminer;
 }
diff --git a/ee/cli/templates/locations.mustache b/ee/cli/templates/locations.mustache
@@ -41,28 +41,28 @@ if ($uri ~* "^.+(readme|license|example)\.(txt|html)$") {
   return 403;
 }
 # Status pages
-location /nginx_status {
+location = /nginx_status {
   stub_status on;
   access_log off;
   include common/acl.conf;
 }
-location ~ ^/(status|ping) {
+location ~ ^/(status|ping)$ {
   include fastcgi_params;
   fastcgi_pass php;
   include common/acl.conf;
 }
 # EasyEngine (ee) utilities
 # phpMyAdmin settings
-location /pma {
+location = /pma {
   return 301 https://$host:22222/db/pma;
 }
-location /phpMyAdmin {
+location = /phpMyAdmin {
   return 301 https://$host:22222/db/pma;
 }
-location /phpmyadmin {
+location = /phpmyadmin {
   return 301 https://$host:22222/db/pma;
 }
 # Adminer settings
-location /adminer {
+location = /adminer {
   return 301 https://$host:22222/db/adminer;
 }

Original file line number	Diff line number	Diff line change
`@@ -41,28 +41,28 @@ if ($uri ~* "^.+(readme\|license\|example)\.(txt\|html)$") {`
`41`	`41`	`return 403;`
`42`	`42`	`}`
`43`	`43`	`# Status pages`
`44`		`-location /nginx_status {`
	`44`	`+location = /nginx_status {`
`45`	`45`	`stub_status on;`
`46`	`46`	`access_log off;`
`47`	`47`	`include common/acl.conf;`
`48`	`48`	`}`
`49`		`-location ~ ^/(status\|ping) {`
	`49`	`+location ~ ^/(status\|ping)$ {`
`50`	`50`	`include fastcgi_params;`
`51`	`51`	`fastcgi_pass php7;`
`52`	`52`	`include common/acl.conf;`
`53`	`53`	`}`
`54`	`54`	`# EasyEngine (ee) utilities`
`55`	`55`	`# phpMyAdmin settings`
`56`		`-location /pma {`
	`56`	`+location = /pma {`
`57`	`57`	`return 301 https://$host:22222/db/pma;`
`58`	`58`	`}`
`59`		`-location /phpMyAdmin {`
	`59`	`+location = /phpMyAdmin {`
`60`	`60`	`return 301 https://$host:22222/db/pma;`
`61`	`61`	`}`
`62`		`-location /phpmyadmin {`
	`62`	`+location = /phpmyadmin {`
`63`	`63`	`return 301 https://$host:22222/db/pma;`
`64`	`64`	`}`
`65`	`65`	`# Adminer settings`
`66`		`-location /adminer {`
	`66`	`+location = /adminer {`
`67`	`67`	`return 301 https://$host:22222/db/adminer;`
`68`	`68`	`}`