[packages/nagios] add nagioshome macro

glen glen at pld-linux.org
Wed Apr 29 18:38:59 CEST 2015


commit 62e447828a4886bd1daedee9d46da976a654b43f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 29 19:38:45 2015 +0300

    add nagioshome macro

 nagios.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 214f11c..78e8f8e 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -74,6 +74,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_sysconfdir	/etc/%{name}
 %define		cgidir		%{_libdir}/%{name}/cgi
 %define		htmldir		%{_prefix}/share/%{name}
+%define		nagioshome	%{_libdir}/%{name}
 %define		_localstatedir	/var/lib/%{name}
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
@@ -408,9 +409,9 @@ fi
 %groupadd -g 72 nagios
 %groupadd -g 147 -f nagcmd
 if [ -n "$(id -u netsaint 2>/dev/null)" ] && [ "$(id -u netsaint)" = "72" ]; then
-	/usr/sbin/usermod -d %{_libdir}/%{name} -l nagios -c "Nagios Daemon" -G nagcmd netsaint
+	/usr/sbin/usermod -d %{nagioshome} -l nagios -c "Nagios Daemon" -G nagcmd netsaint
 fi
-%useradd -u 72 -d %{_libdir}/%{name} -s /bin/false -c "Nagios Daemon" -g nagios -G nagcmd nagios
+%useradd -u 72 -d %{nagioshome} -s /bin/false -c "Nagios Daemon" -g nagios -G nagcmd nagios
 
 %postun common
 if [ "$1" = "0" ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/62e447828a4886bd1daedee9d46da976a654b43f



More information about the pld-cvs-commit mailing list