Author: glen Date: Wed Nov 30 20:49:04 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use webapps framework
---- Files affected:
SPECS:
nagios.spec (1.62 -> 1.63)
---- Diffs:
================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.62 SPECS/nagios.spec:1.63
--- SPECS/nagios.spec:1.62 Sun Nov 20 23:54:18 2005
+++ SPECS/nagios.spec Wed Nov 30 21:48:59 2005
@@ -11,7 +11,7 @@
Name: nagios
Version: 2.0
%define _rc b4
-%define _rel 3
+%define _rel 3.10
Release: 0.%{_rc}.%{_rel}
License: GPL v2
Group: Networking
@@ -27,6 +27,7 @@
Patch0: %{name}-resources.patch
Patch1: %{name}-iconv-in-libc.patch
Patch2: %{name}-favicon.patch
+Patch3: %{name}-webapps.patch
URL: http://www.nagios.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -36,7 +37,7 @@
BuildRequires: libpng-devel
%endif
BuildRequires: sed >= 4.0
-BuildRequires: rpmbuild(macros) >= 1.226
+BuildRequires: rpmbuild(macros) >= 1.264
BuildRequires: tar >= 1:1.15.1
Requires: %{name}-common = %{version}-%{release}
Requires: rc-scripts
@@ -55,6 +56,8 @@
%define _sbindir %{_libdir}/%{name}/cgi
%define _datadir %{_prefix}/share/%{name}
%define _localstatedir /var/lib/%{name}
+%define _webapps /etc/webapps
+%define _webapp %{name}
%description
Nagios is a program that will monitor hosts and services on your
@@ -118,10 +121,11 @@
Summary: CGI webinterface for Nagios
Summary(pl): Interfejs WWW/CGI dla Nagiosa
Group: Applications/WWW
-# for dirs... and accessing local logs(?)
+# for dirs... and accessing local logs.
Requires: %{name} = %{version}-%{release}
Requires: %{name}-imagepaks
Requires: %{name}-theme
+Requires: webapps
Requires: webserver = apache
Requires: apache(mod_alias)
Requires: apache(mod_cgi)
@@ -172,6 +176,7 @@
%patch0 -p0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
sed -i -e '
s,".*/var/rw/nagios.cmd,"%{_localstatedir}/rw/nagios.cmd,
@@ -196,7 +201,8 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_includedir}/%{name},%{_libdir}/%{name}/{eventhandlers,plugins}}
\
-
$RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir},%{_sysconfdir}/{plugins,local},%{_examplesdir}/%{name}-%{version}}
+
$RPM_BUILD_ROOT{%{_var}/log/%{name}/archives,%{_localstatedir},%{_sysconfdir}/{plugins,local},%{_examplesdir}/%{name}-%{version}}
\
+ $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
install include/locations.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -206,7 +212,6 @@
INIT_OPTS="" \
COMMAND_OPTS=""
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}
@@ -214,8 +219,12 @@
# install templated configuration files
tar jxf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_sysconfdir}
-> $RPM_BUILD_ROOT%{_sysconfdir}/passwd
-echo 'nagios:' > $RPM_BUILD_ROOT%{_sysconfdir}/group
+# webserver files
+install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+mv $RPM_BUILD_ROOT{%{_sysconfdir}/cgi.cfg,%{_webapps}/%{_webapp}}
+> $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd
+echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
# install event handlers
cp -a contrib/eventhandlers $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -271,24 +280,25 @@
if [ "$1" = 1 ]; then
%banner %{name} -e <<EOF
NOTE:
-You need to add user to %{_sysconfdir}/passwd and %{_sysconfdir}/group to
acccess nagios via web.
+You need to add user to %{_webapps}/%{_webapp}/passwd and
+%{_webapps}/%{_webapp}/group to access nagios via web.
EOF
fi
-%triggerin cgi -- apache1 >= 1.3.33-2
+%triggerin cgi -- apache1
%addusertogroup http nagios-data
-%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
+%webapp_register apache %{_webapp}
-%triggerun cgi -- apache1 >= 1.3.33-2
-%apache_config_uninstall -v 1
+%triggerun cgi -- apache1
+%webapp_unregister apache %{_webapp}
%triggerin cgi -- apache >= 2.0.0
%addusertogroup http nagios-data
-%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+%webapp_register httpd %{_webapp}
-%triggerun cgi -- apache >= 2.0.0
-%apache_config_uninstall -v 2
+%triggerun -- apache >= 2.0.0
+%webapp_unregister httpd %{_webapp}
%triggerpostun -- nagios-cgi < 2.0-0.b3.21
chown root:http %{_sysconfdir}/cgi.cfg
@@ -329,19 +339,7 @@
chown nagios:nagios %{_localstatedir}/nagios.pid 2>/dev/null
chown nagios:nagios-data %{_localstatedir}/rw/nagios.cmd 2>/dev/null
-if [ -f /var/lock/subsys/%{name} ]; then
- /etc/rc.d/init.d/%{name} restart 1>&2 || :
-fi
-
-# apache2 config was also moved.
-if [ -f /etc/httpd/nagios.conf.rpmsave ]; then
- cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
- mv -f /etc/httpd/nagios.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf
-
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2 || :
- fi
-fi
+%service %{name} restart
%banner -e %{name}-2.0 <<'EOF'
Please read <http://nagios.sourceforge.net/docs/2_0/whatsnew.html>
@@ -353,13 +351,64 @@
EOF
#'vim
+# webapps trigger
+%triggerpostun cgi -- %{name}-cgi < 2.0-0.b4.3.8
+for i in cgi.cfg group passwd; do
+ if [ -f /etc/nagios/$i.rpmsave ]; then
+ mv -f %{_webapps}/%{_webapp}/$i{,.rpmnew}
+ mv -f /etc/nagios/$i.rpmsave %{_webapps}/%{_webapp}/$i
+ fi
+done
+
+# migrate from httpd (apache2) config dir
+if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
+ cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
+ mv -f /etc/httpd/%{name}.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
+fi
+
+# migrate from apache-config macros
+if [ -f /etc/%{name}/apache-nagios.conf.rpmsave ]; then
+ if [ -d /etc/apache/webapps.d ]; then
+ cp -f %{_webapps}/%{_webapp}/apache.conf{,.rpmnew}
+ cp -f /etc/%{name}/apache-nagios.conf.rpmsave
%{_webapps}/%{_webapp}/apache.conf
+ fi
+
+ if [ -d /etc/httpd/webapps.d ]; then
+ cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
+ cp -f /etc/%{name}/apache-nagios.conf.rpmsave
%{_webapps}/%{_webapp}/httpd.conf
+ fi
+ rm -f /etc/%{name}/apache-nagios.conf.rpmsave
+fi
+
+# place new config location, as trigger puts config only on first install, do
it here.
+# apache1
+if [ -d /etc/apache/webapps.d ]; then
+ /usr/sbin/webapp register apache %{_webapp}
+ apache_reload=1
+fi
+# apache2
+if [ -d /etc/httpd/webapps.d ]; then
+ /usr/sbin/webapp register httpd %{_webapp}
+ httpd_reload=1
+fi
+
+if [ "$httpd_reload" ]; then
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd reload 1>&2
+ fi
+fi
+if [ "$apache_reload" ]; then
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache reload 1>&2
+ fi
+fi
+
%files
%defattr(644,root,root,755)
%doc Changelog README* UPGRADING INSTALLING LICENSE
%doc sample-config/template-object/{bigger,minimal}.cfg
%attr(640,root,nagios-data) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/nagios.cfg
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/[!n]*.cfg
-%exclude %{_sysconfdir}/cgi.cfg
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
@@ -367,7 +416,7 @@
%attr(755,root,root) %{_bindir}/%{name}
%attr(755,root,root) %{_bindir}/nagiostats
-%attr(770,root,nagios-data) %{_var}/log/%{name}
+%attr(770,root,nagios-data) %dir %{_var}/log/%{name}
%attr(770,root,nagios-data) %dir %{_var}/log/%{name}/archives
%attr(770,root,nagios-data) %dir %{_localstatedir}
@@ -390,10 +439,12 @@
%files cgi
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache-%{name}.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/cgi.cfg
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/passwd
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/group
+%dir %attr(750,root,http) %{_webapps}/%{_webapp}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_webapps}/%{_webapp}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_webapps}/%{_webapp}/httpd.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_webapps}/%{_webapp}/cgi.cfg
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_webapps}/%{_webapp}/passwd
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size)
%{_webapps}/%{_webapp}/group
%dir %{_sbindir}
%attr(755,root,root) %{_sbindir}/*.cgi
@@ -424,6 +475,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2005/11/30 20:48:59 glen
+- use webapps framework
+
Revision 1.62 2005/11/20 22:54:18 glen
- killed unused macros
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
