Merged revisions 2681-2739 from 3.0.4 stable branch.

tbrehm

2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d

 server/conf/nginx_vhost.conf.master

@@ -111,5 +111,13 @@

<tmpl_loop name="nginx_directives">
        <tmpl_var name='nginx_directive'>
</tmpl_loop>	
</tmpl_loop>

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