rpms/nagios/devel nagios.htaccess,1.2,1.3 nagios.spec,1.5,1.6

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13856/devel

Modified Files:
	nagios.htaccess nagios.spec 
Log Message:
Updates to Apache config.  Updated FC3 to 2.0 branch.



Index: nagios.htaccess
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.htaccess,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.htaccess	4 Feb 2006 22:47:50 -0000	1.2
+++ nagios.htaccess	7 Feb 2006 02:59:23 -0000	1.3
@@ -4,6 +4,9 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   AuthType Basic
+   AuthUserFile /etc/nagios/passwd
+   AuthName "nagios"
    require valid-user
 </Directory>
 
@@ -13,16 +16,19 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   AuthType Basic
+   AuthUserFile /etc/nagios/passwd
+   AuthName "nagios"
    require valid-user
 </Directory>
 
 # For SSL-servers
-#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
 #<Directory /usr/lib/nagios/cgi-bin/>
 #   Options ExecCGI
 #   SSLRequireSSL
 #   order deny,allow
 #   deny from all
+#   allow from 127.0.0.1
 #   AuthType Basic
 #   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"
@@ -35,6 +41,7 @@
 #   SSLRequireSSL
 #   order deny,allow
 #   deny from all
+#   allow from 127.0.0.1
 #   AuthType Basic
 #   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nagios.spec	4 Feb 2006 22:47:50 -0000	1.5
+++ nagios.spec	7 Feb 2006 02:59:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.2.rc2%{?dist}
+Release: 0.3.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -154,6 +154,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Feb 06 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.3.rc2
+- Added proper basic Auth to Apache config for non SSL users
+
 * Sat Feb 04 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.2.rc2
 - Fixed default options in Apache config
 - Fixed %{_libdir} in Apache config for x86_64 machines