averi pushed to check-mk (f21). "Install the check_mk_caching_agent making sure it's disabled by default."

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 13 09:40:55 UTC 2015 

>From 5c40e1313d2cdb2797676629dd3b2b937f7a7df3 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 11:38:11 +0200
Subject: Install the check_mk_caching_agent making sure it's disabled by
 default.


diff --git a/check-mk.spec b/check-mk.spec
index afa1881..6f7fe0d 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -115,9 +115,22 @@ make waitmax
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/xinetd.d
 install -m 644 xinetd.conf %{buildroot}%{_sysconfdir}/xinetd.d/check-mk-agent
+install -m 644 xinetd_caching.conf %{buildroot}%{_sysconfdir}/xinetd.d/check-mk-caching-agent
+
+# Make sure check-mk-caching-agent is installed but not enabled by default
+sed -i 's/\tdisable        = no/\tdisable        = yes/g' xinetd_caching.conf \
+  %{buildroot}%{_sysconfdir}/xinetd.d/check-mk-caching-agent
 
 install -d -m 755 %{buildroot}%{_bindir}
 install -m 755 check_mk_agent.linux %{buildroot}%{_bindir}/check_mk_agent
+install -m 755 check_mk_caching_agent.linux %{buildroot}%{_bindir}/check_mk_caching_agent
+
+# And finally remove the xinetd configuration files from /usr/share/check_mk/agents as they
+# have been installed on /etc/xinetd.d already. Do the same for the check_mk_agent files.
+rm %{buildroot}%{_datadir}/check_mk/agents/xinetd.conf
+rm %{buildroot}%{_datadir}/check_mk/agents/xinetd_caching.conf
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.linux
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
 
 # mk-job installation
 install -m 755 mk-job %{buildroot}%{_bindir}/mk-job
@@ -192,7 +205,7 @@ sed -i 's|#!/usr/bin/pnp|#!/usr/bin/php|1' \
 # on the /etc/nagios/objects directory.
 mkdir -p %{buildroot}%{_sysconfdir}/nagios/conf.d/
 cp -r %{buildroot}%{_datadir}/check_mk/check_mk_templates.cfg %{buildroot}%{_sysconfdir}/nagios/conf.d/check_mk_templates.cfg
-rm -rf %{buildroot}%{_sysconfdir}/nagios/objects/check_mk_templates.cfg
+rm %{buildroot}%{_sysconfdir}/nagios/objects/check_mk_templates.cfg
 
 # Fix the path for the Nagios plugins
 sed -i 's|/usr/lib/nagios/plugins|%{_libdir}/nagios/plugins|' \
@@ -207,26 +220,23 @@ rm -rf %{buildroot}%{_datadir}/check_mk/web/htdocs/defaults.py
 install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/check_mk/web/htdocs/
 
 # Remove other operating systems agents, we definitely don't need them on this package.
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.aix
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.freebsd
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.hpux
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.macosx
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.netbsd
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openbsd
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openvms
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.solaris
-# No need to ship the check_mk_agent for Linux given that's what we install by default.
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.linux
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_caching_agent.linux
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.aix
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.freebsd
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.hpux
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.macosx
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.netbsd
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openbsd
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.openvms
+rm %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.solaris
+rm %{buildroot}%{_datadir}/check_mk/agents/mk-job.solaris
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/solaris/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/hpux/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/sap/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/special/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/z_os/
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/mk-job.solaris
 
 # Remove deprecated agent plugins and their documentation
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/plugins/j4p_performance
+rm %{buildroot}%{_datadir}/check_mk/agents/plugins/j4p_performance
 rm -rf %{buildroot}%{_docdir}/check_mk/treasures/deprecated/
 
 # Remove the documentation for agents we are not going to package
@@ -239,9 +249,9 @@ rm -rf %{buildroot}%{_docdir}/check_mk/treasures/msexchange/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
 
 # Remove DEB and RPM files that upstream ships
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
-rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent_%{version}-%{nodistrelease}_all.deb
+rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
+rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
+rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent_%{version}-%{nodistrelease}_all.deb
 
 # Remove waitmax and its leftarounds from the wrong directory, the binary is being
 # built and installed into the check-mk-agent's package already.
@@ -261,15 +271,15 @@ mkdir -p %{buildroot}%{_sysconfdir}/check_mk/conf.d/wato
 mkdir -p %{buildroot}%{_localstatedir}/lib/check_mk_agent/job
 
 # Remove mk-job from its old location
-rm -f %{buildroot}%{_datadir}/check_mk/agents/mk-job
+rm %{buildroot}%{_datadir}/check_mk/agents/mk-job
 
 # Remove files that are present on other subpackages from -doc
-rm -rf %{buildroot}%{_docdir}/check_mk/AUTHORS
-rm -rf %{buildroot}%{_docdir}/check_mk/COPYING
-rm -rf %{buildroot}%{_docdir}/check_mk/ChangeLog
+rm %{buildroot}%{_docdir}/check_mk/AUTHORS
+rm %{buildroot}%{_docdir}/check_mk/COPYING
+rm %{buildroot}%{_docdir}/check_mk/ChangeLog
 
 # Remove the OMD-related README file
-rm -rf %{buildroot}%{_docdir}/check_mk/README.setup_in_omd
+rm %{buildroot}%{_docdir}/check_mk/README.setup_in_omd
 
 # Fix for 64-bit arches
 %if %{_lib} == lib64
@@ -305,10 +315,12 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %files agent
 %{_datadir}/check_mk/agents
 %{_bindir}/check_mk_agent
+%{_bindir}/check_mk_caching_agent
 %{_bindir}/waitmax
 %{_bindir}/mk-job
 %{_datadir}/check-mk-agent
 %config(noreplace) %{_sysconfdir}/xinetd.d/check-mk-agent
+%config(noreplace) %{_sysconfdir}/xinetd.d/check-mk-caching-agent
 %config(noreplace) %{_sysconfdir}/check-mk-agent
 %attr(755, -, -) %{_localstatedir}/lib/check_mk_agent/job  
 %doc COPYING
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=f21&id=5c40e1313d2cdb2797676629dd3b2b937f7a7df3

More information about the scm-commits mailing list