From 2dd5bf0594557318bb2d83ce6ccf8b352d325bc1 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 25 Jun 2018 12:33:40 -0500 Subject: [PATCH] Update ordering of auth providers in apache reverse proxy This updates the ordering of the basic auth providers in the elasticsearch and nagios chart to check the file provider first before going out to check the configured ldap server. Change-Id: I47ff8a1c7b2cefa8425914c5d4d7a76aa8d43216 Signed-off-by: Steve Wilkerson --- elasticsearch/templates/etc/_elasticsearch-host.conf.tpl | 2 +- nagios/templates/etc/_nagios-host.conf.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/templates/etc/_elasticsearch-host.conf.tpl b/elasticsearch/templates/etc/_elasticsearch-host.conf.tpl index 6ead2d76c..0b5e0f092 100644 --- a/elasticsearch/templates/etc/_elasticsearch-host.conf.tpl +++ b/elasticsearch/templates/etc/_elasticsearch-host.conf.tpl @@ -24,7 +24,7 @@ limitations under the License. AuthName "Elasticsearch" AuthType Basic - AuthBasicProvider ldap file + AuthBasicProvider file ldap AuthUserFile /usr/local/apache2/conf/.htpasswd AuthLDAPBindDN ${BIND_DN} AuthLDAPBindPassword ${BIND_PASSWORD} diff --git a/nagios/templates/etc/_nagios-host.conf.tpl b/nagios/templates/etc/_nagios-host.conf.tpl index b2c85fb74..4e51aff17 100644 --- a/nagios/templates/etc/_nagios-host.conf.tpl +++ b/nagios/templates/etc/_nagios-host.conf.tpl @@ -19,7 +19,7 @@ limitations under the License. AuthName "Nagios" AuthType Basic - AuthBasicProvider ldap file + AuthBasicProvider file ldap AuthUserFile /usr/local/apache2/conf/.htpasswd AuthLDAPBindDN ${BIND_DN} AuthLDAPBindPassword ${BIND_PASSWORD}