Merge pull request hestiacp#914 from felipenovais/fix-path-phpmyadmin.inc-and-fix-static-assets-not-loading-on-webmail

serghey-rodin · web-flow · commit 2e01ba24669b · 2016-11-22T17:44:03.000+03:00
(RHEL7) Fix path in phpmyadmin.inc and fix static resources (css, js, imgs) not loading in RoundCube
diff --git a/install/rhel/7/nginx/phpmyadmin.inc b/install/rhel/7/nginx/phpmyadmin.inc
@@ -13,6 +13,6 @@ location /phpmyadmin {
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
     location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
-        root /usr/share/;
+        alias /usr/share/phpMyAdmin/$1;
     }
 }
diff --git a/install/rhel/7/nginx/webmail.inc b/install/rhel/7/nginx/webmail.inc
@@ -12,4 +12,7 @@ location /webmail {
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
+    location ~* ^/webmail/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
+        alias /usr/share/roundcubemail/$1;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ location /phpmyadmin {`
`13`	`13`	`fastcgi_param SCRIPT_FILENAME $request_filename;`
`14`	`14`	`}`
`15`	`15`	`location ~* ^/phpmyadmin/(.+\.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt))$ {`
`16`		`- root /usr/share/;`
	`16`	`+ alias /usr/share/phpMyAdmin/$1;`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,7 @@ location /webmail {`
`12`	`12`	`include fastcgi_params;`
`13`	`13`	`fastcgi_param SCRIPT_FILENAME $request_filename;`
`14`	`14`	`}`
	`15`	`+ location ~* ^/webmail/(.+\.(jpg\|jpeg\|gif\|css\|png\|js\|ico\|html\|xml\|txt))$ {`
	`16`	`+ alias /usr/share/roundcubemail/$1;`
	`17`	`+ }`
`15`	`18`	`}`