Hello community,
here is the log from the commit of package icinga for openSUSE:Factory checked
in at 2012-03-12 20:13:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icinga (Old)
and /work/SRC/openSUSE:Factory/.icinga.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2012-03-01
17:20:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2012-03-12
20:14:00.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 2 16:36:48 UTC 2012 - thard...@suse.com
+
+- Changed the spec file to use the nagios-rpm-macro variables
+- Fixed a rare bug in rcido2db when the pid directory was missing during first
start
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icinga.spec ++++++
--- /var/tmp/diff_new_pack.UtyQ6t/_old 2012-03-12 20:14:01.000000000 +0100
+++ /var/tmp/diff_new_pack.UtyQ6t/_new 2012-03-12 20:14:01.000000000 +0100
@@ -16,23 +16,21 @@
#
-%define logdir %{_localstatedir}/log/icinga
+%define apacheconfdir %{_sysconfdir}/apache2/conf.d
+# overload eventhandlerdir with the original value for now to not break
backward
+# compatibility, this will be changed with the next upstream version
integration
+# to /usr/lib/icinga/eventhandler
+%define icinga_eventhandlerdir %{_prefix}/lib/nagios/plugins/eventhandlers/
Name: icinga
Version: 1.6.1
-Release: 0
-%define nsusr icinga
-%define nsgrp icinga
-%define cmdgrp icingacmd
-%define cmdusr wwwrun
+Release: 2
+License: GPL-2.0
# Macro that print mesages to syslog at package (un)install time
%define nnmmsg logger -t %{name}/rpm
-%define apacheuser wwwrun
-%define apachegroup www
Summary: Host/service/network monitoring program
-License: GPL-2.0
-Group: System/Monitoring
Url: http://www.icinga.org/
+Group: System/Monitoring
Source0: %{name}-%{version}.tar.gz
Source1: rc%{name}
Source2: rcido2db
@@ -47,6 +45,7 @@
# PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
Patch0: icinga-add-ifdefine-to-apache.patch
BuildRequires: apache2-devel
+BuildRequires: nagios-rpm-macros
%if 0%{?suse_version} >= 1110
BuildRequires: fdupes
%endif
@@ -173,6 +172,7 @@
Group: System/Monitoring
Requires: %{name}-idoutils = %{version}
Recommends: oracle-client
+Provides: %{name}-idoutils-drivers-dbd = %{version}
%description idoutils-oracle
This package requires all needed packages for using IDOUtils with OracleDB.
@@ -212,8 +212,8 @@
%patch0 -p1
# replace default ido2db lock and socket file settings
-sed -ie
"s|@localstatedir@/ido2db.lock|%{_localstatedir}/run/%{name}/ido2db.pid|g; \
-
s|@localstatedir@/ido.sock|%{_localstatedir}/spool/%{name}/ido2db.sock|g;" \
+sed -ie "s|@localstatedir@/ido2db.lock|%{icinga_ido2db_lockfile}|g; \
+ s|@localstatedir@/ido.sock|%{icinga_ido2db_socketfile}|g;" \
"module/idoutils/config/ido2db.cfg-sample.in" \
"module/idoutils/config/idomod.cfg-sample.in";
@@ -223,29 +223,29 @@
%build
export PATH_TO_TRACEROUTE="%{_sbindir}/traceroute"
%configure \
- --exec-prefix=%{_sbindir} \
- --bindir=%{_sbindir} \
- --sbindir=%{_prefix}/lib/%{name}/cgi \
- --libexecdir=%{_prefix}/lib/nagios/plugins \
- --datarootdir=%{_datadir}/%{name} \
- --sysconfdir=/%{_sysconfdir}/%{name} \
- --with-p1-file-dir=/%{_datadir}/%{name} \
- --with-init-dir=/etc/init.d \
- --localstatedir=%{_localstatedir}/lib/%{name} \
- --with-checkresult-dir="%{_localstatedir}/lib/%{name}/checkresults" \
- --with-cgiurl=/%{name}/cgi-bin \
- --with-htmurl=/%{name} \
- --with-httpd-conf=%{_sysconfdir}/apache2/conf.d \
- --with-lockfile=%{_localstatedir}/run/%{name}/%{name}.pid \
- --with-ext-cmd-file-dir="%{_localstatedir}/spool/%{name}" \
- --with-log-dir=%{logdir} \
- --with-cgi-log-dir=%{logdir}/www \
- --with-icinga-user=%{nsusr} \
- --with-icinga-group=%{nsgrp} \
- --with-command-user=%{cmdusr} \
- --with-command-group=%{cmdgrp} \
- --with-gd-lib=%{_libdir} \
- --with-gd-inc=%{_includedir} \
+ --exec-prefix="%{_sbindir}" \
+ --bindir="%{_sbindir}" \
+ --sbindir="%{icinga_cgidir}" \
+ --libexecdir="%{icinga_plugindir}" \
+ --datarootdir="%{icinga_datadir}" \
+ --sysconfdir="%{icinga_sysconfdir}" \
+ --with-p1-file-dir="%{icinga_datadir}" \
+ --with-init-dir="%{_sysconfdir}/init.d" \
+ --localstatedir="%{icinga_localstatedir}" \
+ --with-checkresult-dir="%{icinga_localstatedir}/checkresults" \
+ --with-cgiurl="/%{name}/cgi-bin" \
+ --with-htmurl="/%{name}" \
+ --with-httpd-conf="%{apacheconfdir}" \
+ --with-lockfile="%{icinga_lockfile}" \
+ --with-ext-cmd-file-dir="%{icinga_spooldir}" \
+ --with-log-dir="%{icinga_logdir}" \
+ --with-cgi-log-dir="%{icinga_logdir}/www" \
+ --with-icinga-user="%{icinga_user}" \
+ --with-icinga-group="%{icinga_group}" \
+ --with-command-user="%{icinga_command_user}" \
+ --with-command-group="%{icinga_command_group}" \
+ --with-gd-lib="%{_libdir}" \
+ --with-gd-inc="%{_includedir}" \
--with-perlcache \
--enable-event-broker \
--enable-embedded-perl \
@@ -262,10 +262,10 @@
sed -i "s=/usr/local/nagios/var/rw/=/var/spool/%{name}/=; \
s=/usr/local/%{name}/var/rw/=/var/spool/%{name}/=; \
s=NscaBin\=\"/usr/local/nagios/libexec/send_nsca\"=NscaBin\=/usr/bin/send_nsca=;
\
-
s=/usr/local/nagios/libexec/eventhandlers/=%{_prefix}/lib/nagios/plugins/eventhandlers/=;
\
-
s=/usr/local/%{name}/libexec/eventhandlers/=%{_prefix}/lib/nagios/plugins/eventhandlers/=;
\
- s=/usr/local/nagios/libexec/=%{_prefix}/lib/nagios/plugins/=; \
- s=/usr/local/nagios/etc/=%{_sysconfdir}/%{name}/=; \
+
s=/usr/local/nagios/libexec/eventhandlers/=%{icinga_eventhandlerdir}/=; \
+
s=/usr/local/%{name}/libexec/eventhandlers/=%{icinga_eventhandlerdir}/=; \
+ s=/usr/local/nagios/libexec/=%{icinga_plugindir}/=; \
+ s=/usr/local/nagios/etc/=%{icinga_sysconfdir}/=; \
s=/usr/local/nagios/test/var=/var/log/%{name}=" ${f}
done
popd 1>/dev/null
@@ -274,60 +274,60 @@
make
%install
-install -d -m0775 %{buildroot}%{_localstatedir}/log/%{name}/archives
-install -d -m0775 %{buildroot}%{_localstatedir}/spool/%{name}
-install -d -m0775 %{buildroot}%{_sbindir}
-install -d -m0755 %{buildroot}%{_includedir}/%{name}
-install -d -m0755 %{buildroot}%{_sysconfdir}/init.d
-install -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
-install -d -m0755 %{buildroot}%{_sysconfdir}/apache2/conf.d
-install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/objects
-install -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name}
-install -d -m0755 %{buildroot}%{_prefix}/lib/nagios/plugins/eventhandlers
+install -d -m0775 "%{buildroot}%{_localstatedir}/log/%{name}/archives"
+install -d -m0775 "%{buildroot}%{_localstatedir}/spool/%{name}"
+install -d -m0775 "%{buildroot}%{_sbindir}"
+install -d -m0755 "%{buildroot}%{_includedir}/%{name}"
+install -d -m0755 "%{buildroot}%{_sysconfdir}/init.d"
+install -d -m0755 "%{buildroot}%{_sysconfdir}/logrotate.d"
+install -d -m0755 "%{buildroot}%{apacheconfdir}"
+install -d -m0755 "%{buildroot}%{icinga_sysconfdir}/objects"
+install -d -m0755 "%{buildroot}%{icinga_localstatedir}"
+install -d -m0755 "%{buildroot}%{icinga_eventhandlerdir}"
make install install-commandmode install-idoutils install-config
install-webconf install-cgis install-init \
DESTDIR=%{buildroot} \
INSTALL_OPTS="" \
COMMAND_OPTS="" \
INSTALL_OPTS_WEB="" \
- CGIDIR="%{_prefix}/lib/%{name}/cgi" \
- CGICFGDIR="%{_sysconfdir}/%{name}" \
+ CGIDIR="%{icinga_libdir}/cgi" \
+ CGICFGDIR="%{icinga_sysconfdir}" \
INIT_OPTS=""
make install -C contrib \
DESTDIR=%{buildroot} \
- CGIDIR="%{_prefix}/lib/%{name}/cgi" \
- CGICFGDIR="%{_sysconfdir}/%{name}" \
+ CGIDIR="%{icinga_libdir}/cgi" \
+ CGICFGDIR="%{icinga_sysconfdir}" \
INSTALL_OPTS=""
### move idoutils sample configs to final name
-mv %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg-sample
%{buildroot}%{_sysconfdir}/icinga/ido2db.cfg
-mv %{buildroot}%{_sysconfdir}/icinga/idomod.cfg-sample
%{buildroot}%{_sysconfdir}/icinga/idomod.cfg
-mv %{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg-sample
%{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg
+mv "%{buildroot}%{icinga_sysconfdir}/ido2db.cfg-sample"
"%{buildroot}%{icinga_sysconfdir}/ido2db.cfg"
+mv "%{buildroot}%{icinga_sysconfdir}/idomod.cfg-sample"
"%{buildroot}%{icinga_sysconfdir}/idomod.cfg"
+mv "%{buildroot}%{icinga_sysconfdir}/modules/idoutils.cfg-sample"
"%{buildroot}%{icinga_sysconfdir}/modules/idoutils.cfg"
# install directory for event brokers like ndoutils
-install -d -m0755 %{buildroot}%{_prefix}/lib/nagios/brokers
+install -d -m0755 "%{buildroot}%{_prefix}/lib/nagios/brokers"
# install eventhandlers
-cp -r contrib/eventhandlers %{buildroot}%{_prefix}/lib/nagios/plugins/
+cp -r contrib/eventhandlers/* "%{buildroot}%{icinga_eventhandlerdir}"
# install headers for development package
-install -d -m0755 %{buildroot}%{_includedir}/%{name}/
-install -m0644 include/{config,snprintf,cgiutils,locations}.h
%{buildroot}%{_includedir}/%{name}
+install -d -m0755 "%{buildroot}%{_includedir}/%{name}/"
+install -m0644 include/{config,snprintf,cgiutils,locations}.h
"%{buildroot}%{_includedir}/%{name}"
# remove unnecessary files from www log directory
-rm %{buildroot}/%{logdir}/www/{.htaccess,index.htm}
+rm "%{buildroot}/%{icinga_logdir}/www/"{.htaccess,index.htm}
# REST of special SUSE stuff here, if needed....
# init-scripts
# remove the default init script as SUSE uses an adapted one
-test -f %{buildroot}%{_sysconfdir}/init.d/%{name} && rm -v
%{buildroot}%{_sysconfdir}/init.d/%{name}
-install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
-ln -sf ../../%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
-install -D -m0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/ido2db
-ln -sf ../../%{_sysconfdir}/init.d/ido2db %{buildroot}%{_sbindir}/rcido2db
+test -f "%{buildroot}%{_sysconfdir}/init.d/%{name}" && rm -v
"%{buildroot}%{_sysconfdir}/init.d/%{name}"
+install -D -m0755 %{SOURCE1} "%{buildroot}%{_sysconfdir}/init.d/%{name}"
+ln -sf ../../%{_sysconfdir}/init.d/%{name} "%{buildroot}%{_sbindir}/rc%{name}"
+install -D -m0755 %{SOURCE2} "%{buildroot}%{_sysconfdir}/init.d/ido2db"
+ln -sf ../../%{_sysconfdir}/init.d/ido2db "%{buildroot}%{_sbindir}/rcido2db"
# sysconfig script
-install -D -m 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -D -m 0644 %{SOURCE3}
"%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
# install cronjob (gzip' the logfiles)
-install -D -m 0640 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
+install -D -m 0640 %{SOURCE4} "%{buildroot}%{_sysconfdir}/cron.weekly/%{name}"
%if 0%{?suse_version} >= 1110
%fdupes -s %{buildroot}
%endif
@@ -338,33 +338,30 @@
# install manpages from Debian
mkdir -p %{buildroot}%{_mandir}/man8/
-install -m644 %{SOURCE6} %{buildroot}%{_mandir}/man8/
-install -m644 %{SOURCE7} %{buildroot}%{_mandir}/man8/
-install -m644 %{SOURCE8} %{buildroot}%{_mandir}/man8/
-install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/
+install -m644 %{SOURCE6} "%{buildroot}%{_mandir}/man8/"
+install -m644 %{SOURCE7} "%{buildroot}%{_mandir}/man8/"
+install -m644 %{SOURCE8} "%{buildroot}%{_mandir}/man8/"
+install -m644 %{SOURCE9} "%{buildroot}%{_mandir}/man8/"
# install default www interface user
-install -m644 %{SOURCE12} %{buildroot}%{_sysconfdir}/%{name}/
+install -m644 %{SOURCE12} "%{buildroot}%{icinga_sysconfdir}/"
# install ido2utils scripts
pushd module/idoutils/db/scripts >/dev/null
-test -d %{buildroot}/%{_bindir} || mkdir -p %{buildroot}/%{_bindir}
+test -d "%{buildroot}/%{_bindir}" || mkdir -p "%{buildroot}/%{_bindir}"
for file in *; do
outfile=$(basename $file .in)
sed -e "s|@ido2db_perl@|%{_bindir}/perl|g; \
s|../mysql|%{_defaultdocdir}/%{name}-idoutils-mysql/mysql|g"
\
- $file > %{buildroot}/%{_bindir}/%{name}-$outfile
- chmod +x %{buildroot}/%{_bindir}/%{name}-$outfile
+ $file > "%{buildroot}/%{_bindir}/%{name}-$outfile"
+ chmod +x "%{buildroot}/%{_bindir}/%{name}-$outfile"
done
popd >/dev/null
-%clean
-rm -rf %{buildroot}
-
%pre
-groupadd -r %{nsgrp} 2>/dev/null || :
-groupadd -r %{cmdgrp} 2>/dev/null || :
-/usr/sbin/useradd -c %{nsusr} -s /sbin/nologin -r -d
%{_localstatedir}/lib/%{name} -G %{cmdgrp} -g %{nsgrp} %{nsusr} 2> /dev/null ||
:
+groupadd -r %{icinga_group} 2>/dev/null || :
+groupadd -r %{icinga_command_group} 2>/dev/null || :
+/usr/sbin/useradd -c %{icinga_user} -s /sbin/nologin -r -d
%{icinga_localstatedir} -G %{icinga_command_group} -g %{icinga_group}
%{icinga_user} 2> /dev/null || :
%post
%{fillup_and_insserv %{name}}
@@ -399,15 +396,15 @@
wwwusr=$(awk '/^[ \t]*User[ \t]+[a-zA-Z0-9]+/ {print $2}'
etc/apache2/*.conf)
fi
if [ "z" == "z$wwwusr" ]; then # otherwise, use the default
- wwwusr=%{cmdusr}
+ wwwusr=%{icinga_command_user}
fi
# if apache user is not in cmdgrp, add it
-if /usr/bin/id -Gn $wwwusr 2>/dev/null | /bin/grep -q %{cmdgrp} > /dev/null
2>&1 ; then
- : # $wwwusr (default: %{cmdusr}) is already in %{cmdgrp} group
+if /usr/bin/id -Gn $wwwusr 2>/dev/null | /bin/grep -q %{icinga_command_group}
> /dev/null 2>&1 ; then
+ : # $wwwusr (default: %{icinga_command_user}) is already in
%{icinga_command_group} group
else
# modify apache user, adding it to cmdgrp
- groupmod -A $wwwusr %{cmdgrp} 2>/dev/null
- %nnmmsg "User $wwwusr added to group %{cmdgrp} so sending commands to
Icinga from the command CGI is possible."
+ groupmod -A $wwwusr %{icinga_command_group} 2>/dev/null
+ %nnmmsg "User $wwwusr added to group %{icinga_command_group} so sending
commands to Icinga from the command CGI is possible."
fi
if [ "$1" = "1" ]; then
# this is the initial installation: enable icinga
@@ -428,7 +425,7 @@
%post idoutils
#post a db update notification in case of major updates
if [ "$1" == "2" ] &&
- [ "`rpm -q icinga-idoutils | head -n1 | cut -d- -f3 | cut -d. -f-2`" !=
"`echo %{version} | cut -d. -f-2`" ]; then
+ [ "`rpm -q %{name}-idoutils | head -n1 | cut -d- -f3 | cut -d. -f-2`" !=
"`echo %{version} | cut -d. -f-2`" ]; then
echo
"########################################################################################"
echo "Don't forget to update your database. Check
/usr/share/doc/packages/icinga-idoutils-<db>"
echo
"########################################################################################"
@@ -454,66 +451,66 @@
%{_sbindir}/mini_epn
%{_sbindir}/new_mini_epn
%{_sbindir}/rc%{name}
-%{_datadir}/%{name}/p1.pl
+%{icinga_datadir}/p1.pl
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%attr(0755,root,root) %config %{_sysconfdir}/cron.weekly/*
-%dir %{_prefix}/lib/%{name}
+%dir %{icinga_libdir}
%dir %{_prefix}/lib/nagios
%dir %{_prefix}/lib/nagios/brokers
%dir %{_prefix}/lib/nagios/plugins
-%exclude %{_prefix}/lib/%{name}/cgi
+%exclude %{icinga_libdir}/cgi
%{_sbindir}/convertcfg
-%dir %{_sysconfdir}/icinga
-%dir %{_sysconfdir}/icinga/modules
-%config(noreplace) %{_sysconfdir}/icinga/icinga.cfg
-%dir %{_sysconfdir}/icinga/objects
-%config(noreplace) %{_sysconfdir}/icinga/objects/commands.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/contacts.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/notifications.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/localhost.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/printer.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/switch.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/templates.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/timeperiods.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/windows.cfg
-%config(noreplace) %{_sysconfdir}/icinga/resource.cfg
-%defattr(-,%{nsusr},%{nsgrp})
-%dir %{_localstatedir}/lib/%{name}
-%dir %{_localstatedir}/lib/%{name}/checkresults
-%dir %{logdir}
-%dir %{logdir}/archives
-%attr(0755,%{nsusr},%{cmdgrp}) %dir %{_localstatedir}/spool/%{name}
+%dir %{icinga_sysconfdir}
+%dir %{icinga_sysconfdir}/modules
+%config(noreplace) %{icinga_sysconfdir}/icinga.cfg
+%dir %{icinga_sysconfdir}/objects
+%config(noreplace) %{icinga_sysconfdir}/objects/commands.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/contacts.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/notifications.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/localhost.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/printer.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/switch.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/templates.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/timeperiods.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/windows.cfg
+%config(noreplace) %{icinga_sysconfdir}/resource.cfg
+%defattr(-,%{icinga_user},%{icinga_group})
+%dir %{icinga_localstatedir}
+%dir %{icinga_localstatedir}/checkresults
+%dir %{icinga_logdir}
+%dir %{icinga_logdir}/archives
+%attr(0755,%{icinga_user},%{icinga_command_group}) %dir %{icinga_spooldir}
%files www
%defattr(-,root,root)
-%config(noreplace) %attr(-,root,root)
%{_sysconfdir}/apache2/conf.d/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}/htpasswd.users
-%config(noreplace) %{_sysconfdir}/icinga/cgi.cfg
-%config(noreplace) %{_sysconfdir}/icinga/cgiauth.cfg
-%{_prefix}/lib/icinga/cgi
-%dir %{_datadir}/icinga
-%{_datadir}/icinga/contexthelp
-%{_datadir}/icinga/images
-%{_datadir}/icinga/index.html
-%{_datadir}/icinga/js
-%{_datadir}/icinga/main.html
-%{_datadir}/icinga/media
-%{_datadir}/icinga/menu.html
-%{_datadir}/icinga/robots.txt
-%{_datadir}/icinga/sidebar.html
-%{_datadir}/icinga/ssi
-%{_datadir}/icinga/stylesheets
-%attr(0775,%{apacheuser},%{apachegroup}) %dir %{logdir}/www
+%config(noreplace) %attr(-,root,root) %{apacheconfdir}/%{name}.conf
+%config(noreplace) %{icinga_sysconfdir}/htpasswd.users
+%config(noreplace) %{icinga_sysconfdir}/cgi.cfg
+%config(noreplace) %{icinga_sysconfdir}/cgiauth.cfg
+%{icinga_libdir}/cgi
+%dir %{icinga_datadir}
+%{icinga_datadir}/contexthelp
+%{icinga_datadir}/images
+%{icinga_datadir}/index.html
+%{icinga_datadir}/js
+%{icinga_datadir}/main.html
+%{icinga_datadir}/media
+%{icinga_datadir}/menu.html
+%{icinga_datadir}/robots.txt
+%{icinga_datadir}/sidebar.html
+%{icinga_datadir}/ssi
+%{icinga_datadir}/stylesheets
+%attr(0775,%{icinga_command_user},%{icinga_command_group}) %dir
%{icinga_logdir}/www
%files idoutils
%defattr(-,root,root)
%doc module/idoutils/db/queries module/idoutils/db/README
module/idoutils/config
%{_mandir}/man8/ido2db.8*
%{_sysconfdir}/init.d/ido2db
-%config(noreplace) %{_sysconfdir}/%{name}/ido2db.cfg
-%config(noreplace) %{_sysconfdir}/%{name}/idomod.cfg
-%config(noreplace) %{_sysconfdir}/%{name}/modules/idoutils.cfg
-%config(noreplace) %{_sysconfdir}/icinga/objects/ido2db_check_proc.cfg
+%config(noreplace) %{icinga_sysconfdir}/ido2db.cfg
+%config(noreplace) %{icinga_sysconfdir}/idomod.cfg
+%config(noreplace) %{icinga_sysconfdir}/modules/idoutils.cfg
+%config(noreplace) %{icinga_sysconfdir}/objects/ido2db_check_proc.cfg
%{_sbindir}/rcido2db
%{_sbindir}/ido2db
%{_sbindir}/log2ido
@@ -543,12 +540,10 @@
%files doc
%defattr(-,root,root)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/docs
-%doc %{_datadir}/%{name}/docs/*
+%doc %{icinga_datadir}/docs
%files plugins-eventhandlers
%defattr(0755,root,root)
-%{_prefix}/lib/nagios/plugins/eventhandlers/
+%{icinga_eventhandlerdir}
%changelog
++++++ icinga-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.UtyQ6t/_old 2012-03-12 20:14:01.000000000 +0100
+++ /var/tmp/diff_new_pack.UtyQ6t/_new 2012-03-12 20:14:01.000000000 +0100
@@ -2,11 +2,10 @@
addFilter("non-standard-uid.*icinga");
# ido2db is the official upstream name and should follow the documentation
addFilter("incoherent-init-script-name.*ido2db");
-# we download the file with _service anyway so pointless
+# upstream doesn't intend to change the archive format
addFilter("source-or-patch-not-bzipped");
addFilter("source-or-patch-not-compressed");
# we need these packages to get the right database drivers
addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-mysql");
addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-oracle");
addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-pgsql");
-
++++++ rcicinga ++++++
--- /var/tmp/diff_new_pack.UtyQ6t/_old 2012-03-12 20:14:01.000000000 +0100
+++ /var/tmp/diff_new_pack.UtyQ6t/_new 2012-03-12 20:14:01.000000000 +0100
@@ -103,13 +103,13 @@
sed -e "s|^lock_file.*|pid_file=$lock_file|g"
"$ICINGA_CFG-$DATESTRING" > "$ICINGA_CFG"
/bin/logger -t rcicinga "Configured $lock_file in $ICINGA_CFG
moved to $lock_file. Backup is $ICINGA_CFG-$DATESTRING"
test -f "$lock_file" && rm -f "$lock_file"
- install -d -m755 -o$icinga_user -g$icinga_cmdgrp $(dirname
"$lock_file")
+ install -d -m755 -o$icinga_user -g$icinga_group $(dirname
"$lock_file")
else
test -d "$PIDDIR" || mkdir -p "$PIDDIR"
fi
;;
*)
- install -d -m755 -o$icinga_user -g$icinga_cmdgrp $(dirname
"$lock_file")
+ install -d -m755 -o$icinga_user -g$icinga_group $(dirname
"$lock_file")
esac
}
@@ -145,6 +145,7 @@
# get variables from config file
#
icinga_user="$(get_var icinga_user)"
+icinga_group="$(get_var icinga_group)"
lock_file="$(get_var lock_file)"
status_file="$(get_var status_file)"
log_file="$(get_var log_file)"
@@ -160,6 +161,7 @@
# use default values if above check doesn't work
#
: ${icinga_user:=icinga}
+: ${icinga_group:=icinga}
: ${icinga_cmdgrp:=icingacmd}
: ${resource_file:=/etc/icinga/resource.cfg}
# check ownership files
++++++ rcido2db ++++++
--- /var/tmp/diff_new_pack.UtyQ6t/_old 2012-03-12 20:14:01.000000000 +0100
+++ /var/tmp/diff_new_pack.UtyQ6t/_new 2012-03-12 20:14:01.000000000 +0100
@@ -48,6 +48,10 @@
for file in "$lock_file" "$socket_name"; do
test -e "$file" && rm -f "$file"
done
+
+ # create lock directory if it doesn't exist
+ PIDDIR=$(dirname $lock_file)
+ test -d "$PIDDIR" || install -d -m755 -o$ido2db_user -g$ido2db_group
"$PIDDIR"
}
test -x $IDO2DB_BIN || { echo "$IDO2DB_BIN not installed";
@@ -81,12 +85,16 @@
#
lock_file="$(get_var lock_file)"
socket_name="$(get_var socket_name)"
+ido2db_user="$(get_var ido2db_user)"
+ido2db_group="$(get_var ido2db_group)"
#
# use default values if above check doesn't work
#
: ${lock_file:=/var/run/icinga/ido2db.pid}
: ${socket_name:=/var/spool/icinga/ido2db.sock}
+: ${ido2db_user:=icinga}
+: ${ido2db_group:=icinga}
# Reset status of this service
rc_reset
@@ -193,4 +201,4 @@
exit 1
;;
esac
-rc_exit
\ No newline at end of file
+rc_exit
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
