Hello community, here is the log from the commit of package nagios-rpm-macros for openSUSE:Factory checked in at 2013-08-23 11:08:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios-rpm-macros/nagios-rpm-macros.changes 2013-04-14 10:35:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new/nagios-rpm-macros.changes 2013-08-23 11:08:26.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 7 20:56:02 UTC 2013 - l...@linux-schulserver.de + +- added new macros: + + %icinga_user_group_add + + %icinga_command_user_group_add + to make it easier to have the same useradd/groupadd invocations + in all packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.SqAJ1W/_old 2013-08-23 11:08:27.000000000 +0200 +++ /var/tmp/diff_new_pack.SqAJ1W/_new 2013-08-23 11:08:27.000000000 +0200 @@ -20,7 +20,7 @@ Summary: RPM Macros for Nagios based packages License: BSD-3-Clause Group: System/Monitoring -Version: 0.06 +Version: 0.07 Release: 0 Url: http://en.opensuse.org/Nagios Source0: macros.nagios ++++++ macros.icinga ++++++ --- /var/tmp/diff_new_pack.SqAJ1W/_old 2013-08-23 11:08:27.000000000 +0200 +++ /var/tmp/diff_new_pack.SqAJ1W/_new 2013-08-23 11:08:27.000000000 +0200 @@ -80,3 +80,19 @@ %icinga_command_user wwwrun # Group, that can execute commands via %{icinga_command_file} %icinga_command_group icingacmd + +# Add Icinga user and groups +%icinga_user_group_add() \ + /usr/sbin/groupadd -r %{icinga_group} 2>/dev/null || :\ + /usr/sbin/useradd -r -g %{icinga_group} -d %{icinga_localstatedir} -s /bin/false -c "User for Icinga" %{icinga_user} 2>/dev/null || :\ + %{nil} + +%icinga_command_user_group_add() \ + /usr/sbin/groupadd -r %{icinga_command_group} 2>/dev/null || :\ + %if 0%{?suse_version} > 01220 \ + /usr/sbin/usermod -a -G %{icinga_command_group} %{icinga_user} || :\ + %else \ + /usr/sbin/groupmod -A %{icinga_user} %{icinga_command_group} 2>/dev/null || :\ + %endif \ + %{nil} + ++++++ macros.nagios ++++++ --- /var/tmp/diff_new_pack.SqAJ1W/_old 2013-08-23 11:08:27.000000000 +0200 +++ /var/tmp/diff_new_pack.SqAJ1W/_new 2013-08-23 11:08:27.000000000 +0200 @@ -26,6 +26,11 @@ %nagios_cgidir %{_prefix}/lib/nagios/cgi # +# NRPE +# +%nrpe_sysconfdir %{_sysconfdir}/nrpe.d + +# # files # -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
