rpms/nagios/FC-4 nagios.htaccess,1.1,1.2 nagios.spec,1.4,1.5

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22865

Modified Files:
	nagios.htaccess nagios.spec 
Log Message:
Fixes in apache config for x86_64 machines



Index: nagios.htaccess
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios.htaccess	27 Jan 2006 20:48:02 -0000	1.1
+++ nagios.htaccess	4 Feb 2006 22:55:40 -0000	1.2
@@ -4,6 +4,7 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   require valid-user
 </Directory>
 
 Alias /nagios/ /usr/share/nagios/html/
@@ -12,6 +13,7 @@
    order deny,allow
    deny from all
    allow from 127.0.0.1
+   require valid-user
 </Directory>
 
 # For SSL-servers
@@ -22,11 +24,9 @@
 #   order deny,allow
 #   deny from all
 #   AuthType Basic
-#   AuthUserFile /site/cfg/passwd
-#   AuthGroupFile /site/cfg/group
+#   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"
-#   require group nagios
-#   Satisfy Any
+#   require valid-user
 #</Directory>
 #
 #Alias /nagios/ /usr/share/nagios/html/
@@ -36,10 +36,8 @@
 #   order deny,allow
 #   deny from all
 #   AuthType Basic
-#   AuthUserFile /site/cfg/passwd
-#   AuthGroupFile /site/cfg/group
+#   AuthUserFile /etc/nagios/passwd
 #   AuthName "nagios"
-#   require group nagios
-#   Satisfy Any
+#   require valid-user
 #</Directory>
 


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nagios.spec	27 Jan 2006 20:48:02 -0000	1.4
+++ nagios.spec	4 Feb 2006 22:55:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.0
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -11,11 +11,11 @@
 Source2: nagios.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gd-devel > 1.8
+BuildRequires: gd-devel > 1.8, mailx
 Requires: httpd
 Requires(pre): %{_sbindir}/useradd
-Requires(preun): /sbin/service /sbin/chkconfig
-Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/usermod
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(post): /sbin/chkconfig, /sbin/service, %{_sbindir}/usermod
 Requires(postun): /sbin/service
 
 %description
@@ -79,6 +79,7 @@
 	 -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora
 %{__sed} -e "s|resource.cfg|private/resource.cfg|" \
 	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
+%{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
 echo >> html/stylesheets/common.css
 
@@ -95,7 +96,7 @@
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
 %{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 %{name}.htaccess %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
 %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
 %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
@@ -153,6 +154,10 @@
 %{_includedir}/%{name}
 
 %changelog
+* 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
+
 * Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
 - Using 2.0rc2 tarball