- nginx: merge function: default action is now to replace older locations i...

ftimme

2012-03-30 9b16a37984607aaa74ba915a66dcae47bc338821

 server/conf/nginx_vhost.conf.master

@@ -118,7 +118,7 @@
</tmpl_loop>

<tmpl_loop name="basic_auth_locations">
        location <tmpl_var name='htpasswd_location'> {
        location <tmpl_var name='htpasswd_location'> { ##merge##
                auth_basic "Members Only";
                auth_basic_user_file <tmpl_var name='htpasswd_path'>.htpasswd;
        }