[packages/nagios-plugin-check_varnish] move nagios config to separate file
glen
glen at pld-linux.org
Sun Jan 26 19:16:42 CET 2014
commit f1ca178abcb03f541316cd1f420fef4219fbe812
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Jan 26 20:16:19 2014 +0200
move nagios config to separate file
check_varnish.cfg | 6 ++++++
nagios-plugin-check_varnish.spec | 12 ++----------
2 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/nagios-plugin-check_varnish.spec b/nagios-plugin-check_varnish.spec
index 2604012..4ffcb9d 100644
--- a/nagios-plugin-check_varnish.spec
+++ b/nagios-plugin-check_varnish.spec
@@ -7,6 +7,7 @@ License: BSD
Group: Networking
Source0: http://repo.varnish-cache.org/source/varnish-nagios-%{version}.tar.gz
# Source0-md5: d9a5477f9143187ffe6314ddecb03015
+Source1: %{plugin}.cfg
URL: http://www.varnish-cache.org/
BuildRequires: pkgconfig
BuildRequires: varnish-devel
@@ -24,15 +25,6 @@ Nagios plugin to check Varnish.
%prep
%setup -qn varnish-nagios-%{version}
-cat > nagios.cfg <<'EOF'
-# Usage:
-# %{plugin}
-define command {
- command_name %{plugin}
- command_line %{plugindir}/%{plugin} $ARG1$
-}
-EOF
-
%build
%configure
%{__make}
@@ -41,7 +33,7 @@ EOF
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir}}
install -p %{plugin} $RPM_BUILD_ROOT%{plugindir}/%{plugin}
-cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/check_varnish.cfg b/check_varnish.cfg
new file mode 100644
index 0000000..aaa759b
--- /dev/null
+++ b/check_varnish.cfg
@@ -0,0 +1,6 @@
+# Usage:
+# check_varnish
+define command {
+ command_name check_varnish
+ command_line /usr/lib/nagios/plugins/check_varnish $ARG1$
+}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugin-check_varnish.git/commitdiff/f1ca178abcb03f541316cd1f420fef4219fbe812
More information about the pld-cvs-commit
mailing list