From 9b16a37984607aaa74ba915a66dcae47bc338821 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 30 Mar 2012 11:57:38 -0400
Subject: [PATCH] - 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##").
---
server/conf/nginx_vhost.conf.master | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index c958969..3ef9f00 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/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;
}
--
Gitblit v1.9.1