ISPConfig3 devel
parent: 2655f9 | patch | commitdiff
ftimme
2012-03-30 9b16a37984607aaa74ba915a66dcae47bc338821
refs
author ftimme <ft@falkotimme.com>
Friday, March 30, 2012 11:57 -0400
committer ftimme <ft@falkotimme.com>
Friday, March 30, 2012 11:57 -0400
commit9b16a37984607aaa74ba915a66dcae47bc338821
tree 553b999705d08ad75a906771e13d71e503ba5970 tree | zip | gz
parent 2655f9315464236f2e41d2b6467d9cf97cb2b34b view | diff 
- nginx: merge function: default action is now to replace older locations in the nginx vhost configuration; a merge  instead of a replacement can be achieved by putting the string "##merge##" (without quotes) at the end of the most recent location line (e.g. "location ~ \.php$ { ##merge##").
2 files modified
10 ■■■■■ changed files
server/conf/nginx_vhost.conf.master 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history