rpms/nagios/FC-3 nagios.htaccess,NONE,1.1 nagios.spec,1.2,1.3

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

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

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



--- NEW FILE nagios.htaccess ---
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
<Directory /usr/lib/nagios/cgi-bin/>
   Options ExecCGI
   order deny,allow
   deny from all
   allow from 127.0.0.1
   AuthType Basic
   AuthUserFile /etc/nagios/passwd
   AuthName "nagios"
   require valid-user
</Directory>

Alias /nagios/ /usr/share/nagios/html/
<Directory /usr/share/nagios/html/>
   Options None
   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
#<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"
#   require valid-user
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/html/
#<Directory /usr/share/nagios/html/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   allow from 127.0.0.1
#   AuthType Basic
#   AuthUserFile /etc/nagios/passwd
#   AuthName "nagios"
#   require valid-user
#</Directory>



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
+++ nagios.spec	7 Feb 2006 02:59:12 -0000	1.3
@@ -1,20 +1,21 @@
 Name: nagios
-Version: 1.3
-Release: 14%{?dist}
+Version: 2.0
+Release: 0.3.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
 Source1: nagios.logrotate
+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
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -78,9 +79,9 @@
 	 -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
-%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
-	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora
+echo >> html/stylesheets/common.css
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +95,8 @@
 %{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+%{__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
@@ -133,7 +134,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
+%doc Changelog INSTALLING LICENSE README UPGRADING 
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
@@ -153,6 +154,19 @@
 %{_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
+
+* Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
+- Using 2.0rc2 tarball
+
+* Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
+- Fixed usermod -a issue, Bugzilla #49609
+
 * Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
 - Fedora friendly spec file