[icinga-checkins] icinga.org: icinga-core/master: Revert "move htpasswd to httpd config dir ( selinux)"

git at icinga.org git at icinga.org
Tue Apr 19 23:14:23 CEST 2011


Module: icinga-core
Branch: master
Commit: 37a016a7c29b8d8103bbabd1750c91851e062363
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=37a016a7c29b8d8103bbabd1750c91851e062363

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Apr 19 23:06:47 2011 +0200

Revert "move htpasswd to httpd config dir (selinux)"

This reverts commit 04d27886d93bed953e26c9cc9608643a14d3da87.

compatibility issues!!!!

---

 sample-config/httpd.conf.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sample-config/httpd.conf.in b/sample-config/httpd.conf.in
index 93df41a..bff7868 100644
--- a/sample-config/httpd.conf.in
+++ b/sample-config/httpd.conf.in
@@ -18,7 +18,7 @@ ScriptAlias @cgiurl@ "@sbindir@"
 #  Allow from 127.0.0.1
    AuthName "Icinga Access"
    AuthType Basic
-   AuthUserFile @HTTPD_CONF@/icinga.htpasswd
+   AuthUserFile @sysconfdir@/htpasswd.users
    Require valid-user
 </Directory>
 
@@ -35,7 +35,7 @@ Alias @htmurl@ "@datadir@/"
 #  Allow from 127.0.0.1
    AuthName "Icinga Access"
    AuthType Basic
-   AuthUserFile @HTTPD_CONF@/icinga.htpasswd
+   AuthUserFile @sysconfdir@/htpasswd.users
    Require valid-user
 </Directory>
 





More information about the icinga-checkins mailing list