rpms/nagios/FC-4 nagios.htaccess, NONE, 1.1 .cvsignore, 1.2, 1.3 nagios.spec, 1.3, 1.4 sources, 1.2, 1.3

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

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

Modified Files:
	.cvsignore nagios.spec sources 
Added Files:
	nagios.htaccess 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch FC-4 from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


--- 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
</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
</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
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/html/
#<Directory /usr/share/nagios/html/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
+++ .cvsignore	27 Jan 2006 20:48:02 -0000	1.3
@@ -1 +1 @@
-nagios-1.3.tar.gz
+nagios-2.0rc2.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nagios.spec	26 Jan 2006 22:16:20 -0000	1.3
+++ nagios.spec	27 Jan 2006 20:48:02 -0000	1.4
@@ -1,13 +1,14 @@
 Name: nagios
-Version: 1.3
-Release: 15%{?dist}
+Version: 2.0
+Release: 0.1.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
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -79,8 +80,7 @@
 %{__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
 %{__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 +94,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 %{SOURCE2} %{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 +133,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 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 22:47:20 -0000	1.2
+++ sources	27 Jan 2006 20:48:02 -0000	1.3
@@ -1 +1 @@
-2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz
+373124639093919dc8858a243d760f84  nagios-2.0rc2.tar.gz