Modified: trunk/opsview-base/Makefile
===================================================================
--- trunk/opsview-base/Makefile 2010-11-08 16:55:46 UTC (rev 5335)
+++ trunk/opsview-base/Makefile 2010-11-08 17:49:34 UTC (rev 5336)
@@ -200,7 +200,7 @@
cd .. && gzip -f opsview-base-${VERSION}.tar
cd .. && rm opsview-base-${VERSION}
-agent-tar: opsview-base.spec
+agent-tar: opsview-agent.spec
if [ x${VERSION} = "x" ] ; then echo "Need version" ; false; fi
$(MAKE) clean
$(MAKE) opsview-agent.spec version
@@ -264,7 +264,7 @@
${INSTALL} -d -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0775 ${DESTDIR}/${PLUGIN_DIR}/nrpe_local
${INSTALL} -d -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0755 ${DESTDIR}/${VAR_DIR}
${INSTALL} -c -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0555 ${NRPE}/src/nrpe ${DESTDIR}/${BIN_DIR}/nrpe
- ${INSTALL} -c -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0444 nrpe.cfg ${ETC_DIR}/nrpe.cfg
+ ${INSTALL} -c -o $(NAGIOS_USER) -g $(NAGIOS_GROUP) -m 0444 nrpe.cfg ${DESTDIR}/${ETC_DIR}/nrpe.cfg
$(MAKE) DESTDIR=${DESTDIR} ${NAGIOSPLUG}-install
$(MAKE) DESTDIR=${DESTDIR} nrpe.cfg-install
Modified: trunk/opsview-base/opsview-agent.spec.in.sles10
===================================================================
--- trunk/opsview-base/opsview-agent.spec.in.sles10 2010-11-08 16:55:46 UTC (rev 5335)
+++ trunk/opsview-base/opsview-agent.spec.in.sles10 2010-11-08 17:49:34 UTC (rev 5336)
@@ -18,7 +18,8 @@
Provides: opsview-agent
Conflicts: nagios, nagios-nrpe, opsview-base, opsview-core, opsview-perl, opsview-web
Requires: perl, openssl, /bin/ksh, bash, libmcrypt, libtool, lsb, bind-utils
-BuildRequires: zlib-devel, libmcrypt, libmcrypt-devel, openssl, openssl-devel, gcc, automake, make, unzip, libtool, bind-utils
+Requires(pre): pwdutils
+BuildRequires: zlib-devel, libmcrypt, libmcrypt-devel, openssl, openssl-devel, gcc, automake, make, unzip, libtool, bind-utils, openldap2-devel, pwdutils
Autoreqprov: 0
%define debug_package %{nil}
@@ -47,18 +48,9 @@
exit 1
fi
# Create `nagios' group on the system if necessary
-if grep ^nagios: /etc/group > /dev/null; then
- : # group already exists
-else
- /usr/sbin/groupadd -r nagios || %nnmmsg Unexpected error adding group "nagios". Aborting install process.
-fi
-# Create `nagios' user on the system if necessary
-if id nagios > /dev/null 2>/dev/null ; then
- : # user already exists
-else
- /usr/sbin/useradd -r -m -d /var/log/nagios -s /bin/bash -c "nagios" -g nagios nagios || \
- %nnmmsg Unexpected error adding user "nagios". Aborting install process.
-fi
+getent group nagios >/dev/null || groupadd -r nagios
+getent passwd nagios >/dev/null || useradd -r -m -d /var/log/nagios -s /bin/bash -c "nagios" -g nagios nagios
+exit 0
%post
/sbin/chkconfig --add opsview-agent
@@ -67,15 +59,18 @@
else
/etc/init.d/opsview-agent start
fi
+exit 0
%preun
/etc/init.d/opsview-agent stop
/sbin/chkconfig --del opsview-agent
+exit 0
%postun
if [ "$1" -ge 1 ]; then
/sbin/service opsview-agent restart >/dev/null 2>&1
fi
+exit 0
%files
%defattr(0555,nagios,nagios)
@@ -87,6 +82,8 @@
%attr(0550,nagios,nagios) /usr/local/nagios/etc/nrpe.cfg
%dir %attr(0770,nagios,nagios) /usr/local/nagios/etc/nrpe_local
%dir %attr(0755,nagios,nagios) /usr/local/nagios/var
+/usr/local/nagios/share
+/usr/local/nagios/perl
/usr/local/nagios/libexec
%attr(4550,root,nagios) /usr/local/nagios/libexec/check_icmp
%attr(4550,root,nagios) /usr/local/nagios/libexec/check_dhcp
