[packages/nagios-plugin-check_logfiles] move .cfg file to separate file

glen glen at pld-linux.org
Thu Aug 6 18:02:11 CEST 2015


commit 476e8aadf86f7dbab43154c793c10f0f4db5d520
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 6 18:59:05 2015 +0300

    move .cfg file to separate file

 check_logfiles.cfg                |  6 ++++++
 nagios-plugin-check_logfiles.spec | 17 +++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/nagios-plugin-check_logfiles.spec b/nagios-plugin-check_logfiles.spec
index b3f3b21..ab01c46 100644
--- a/nagios-plugin-check_logfiles.spec
+++ b/nagios-plugin-check_logfiles.spec
@@ -7,8 +7,9 @@ Version:	2.4.1.9
 Release:	0.1
 License:	BSD
 Group:		Networking
-URL:		http://www.consol.com/opensource/nagios/check-logfiles
 Source0:	http://www.consol.com/fileadmin/opensource/Nagios/check_logfiles-%{version}.tar.gz
+Source1:	check_logfiles.cfg
+URL:		http://www.consol.com/opensource/nagios/check-logfiles
 # Source0-md5:	fc2b0d394626eb715643cdbbaf13ba69
 Requires:	nagios-core
 BuildArch:	noarch
@@ -27,15 +28,6 @@ specific patterns.
 %prep
 %setup -q -n %{plugin}-%{version}
 
-cat > nagios.cfg <<'EOF'
-# Usage:
-# %{plugin}
-define command {
-	command_name    %{plugin}
-	command_line    %{plugindir}/%{plugin} $ARG1$
-}
-EOF
-
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -55,11 +47,11 @@ EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,4 +59,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README ChangeLog TODO
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}.cfg
 %attr(755,root,root) %{plugindir}/%{plugin}
diff --git a/check_logfiles.cfg b/check_logfiles.cfg
new file mode 100644
index 0000000..a9dd130
--- /dev/null
+++ b/check_logfiles.cfg
@@ -0,0 +1,6 @@
+# Usage:
+# check_logfiles
+define command {
+	command_name    check_logfiles
+	command_line    /usr/lib/nagios/plugins/check_logfiles $ARG1$
+}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugin-check_logfiles.git/commitdiff/d1afc0520cdedeef5da3e5a78ef8371e44f45f8b



More information about the pld-cvs-commit mailing list