From c6d3b804d9ec6c7062fda5aed9b1de42f5955675 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 8 Feb 2018 11:10:30 +0100
Subject: [PATCH] nginx: fix basic auth  for default vhost

---
 CHANGELOG.md                             | 3 +++
 nginx/templates/evolinux-default.conf.j2 | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd8b65b..8b280d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ The **patch** part changes incrmentally at each release.
 ### Changed
 * elasticsearch: use ES_TMPDIR variable for custom tmpdir, (from `/etc/default/elasticsearch` instead of changing `/etc/elesticsearch/jvm.options`).
 
+### Fixed
+* nginx: fix basic auth for default vhost
+
 ## [9.1.6] - 2018-02-02
 
 ### Added
diff --git a/nginx/templates/evolinux-default.conf.j2 b/nginx/templates/evolinux-default.conf.j2
index 8ea1bd88..6d328455 100644
--- a/nginx/templates/evolinux-default.conf.j2
+++ b/nginx/templates/evolinux-default.conf.j2
@@ -23,10 +23,12 @@ server {
     root /var/www;
 
     # Auth.
+    satisfy any;
     include /etc/nginx/snippets/ipaddr_whitelist;
+    deny all;
+
     auth_basic "Reserved {{ ansible_fqdn }}";
     auth_basic_user_file /etc/nginx/snippets/private_htpasswd;
-    satisfy any;
 
     location / {
         index  index.html index.htm;