From 8ab3cdc09cfbac3157e996664616c229214f6c8d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 21 Oct 2011 06:03:56 -0400
Subject: [PATCH] Merged revisions 2681-2739 from 3.0.4 stable branch.
---
server/conf/nginx_vhost.conf.master | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 4027b56..25e544d 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/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>
+
}
\ No newline at end of file
--
Gitblit v1.9.1