Hello community, here is the log from the commit of package nagios-rpm-macros for openSUSE:Factory checked in at 2014-04-26 06:06:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-27 17:49:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new/nagios-rpm-macros.changes 2014-04-26 06:06:11.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 15 18:08:12 UTC 2014 - [email protected] + +- update to 0.09: + + added macros.icinga2 + +------------------------------------------------------------------- New: ---- macros.icinga2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.g5TTNs/_old 2014-04-26 06:06:11.000000000 +0200 +++ /var/tmp/diff_new_pack.g5TTNs/_new 2014-04-26 06:06:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nagios-rpm-macros # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Summary: RPM Macros for Nagios based packages License: BSD-3-Clause Group: System/Monitoring -Version: 0.08 +Version: 0.09 Release: 0 Url: http://en.opensuse.org/Nagios Source0: macros.nagios @@ -30,6 +30,7 @@ Source4: macros.pnp4nagios Source5: macros.nagiosgrapher Source6: macros.icinga +Source7: macros.icinga2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +51,7 @@ cat %{S:4} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios cat %{S:5} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios cat %{S:6} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios +cat %{S:7} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios %clean rm -rf %buildroot ++++++ macros.icinga ++++++ --- /var/tmp/diff_new_pack.g5TTNs/_old 2014-04-26 06:06:12.000000000 +0200 +++ /var/tmp/diff_new_pack.g5TTNs/_new 2014-04-26 06:06:12.000000000 +0200 @@ -73,26 +73,26 @@ # # User, Icinga runs under -%icinga_user icinga +%icinga2_user icinga # Group, Icinga runs under -%icinga_group icinga +%icinga2_group icinga # User, that can execute commands via %{icinga_command_file} -%icinga_command_user wwwrun +%icinga2_command_user wwwrun # Group, that can execute commands via %{icinga_command_file} -%icinga_command_group icingacmd +%icinga2_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 || :\ +%icinga2_user_group_add() \ + /usr/sbin/groupadd -r %{icinga2_group} 2>/dev/null || :\ + /usr/sbin/useradd -r -g %{icinga2_group} -d %{icinga2_localstatedir} -s /bin/false -c "User for Icinga" %{icinga2_user} 2>/dev/null || :\ %{nil} -%icinga_command_user_group_add() \ - /usr/sbin/groupadd -r %{icinga_command_group} 2>/dev/null || :\ +%icinga2_command_user_group_add() \ + /usr/sbin/groupadd -r %{icinga2_command_group} 2>/dev/null || :\ %if 0%{?suse_version} > 01220 \ - /usr/sbin/usermod -a -G %{icinga_command_group} %{icinga_user} || :\ + /usr/sbin/usermod -a -G %{icinga2_command_group} %{icinga2_user} || :\ %else \ - /usr/sbin/groupmod -A %{icinga_user} %{icinga_command_group} 2>/dev/null || :\ + /usr/sbin/groupmod -A %{icinga2_user} %{icinga2_command_group} 2>/dev/null || :\ %endif \ %{nil} ++++++ macros.icinga2 ++++++ # macros.icinga file # macros for Icinga (sub-)package building - handle with care # # # directories # # install all plugins into this directory # Please note: we use the old Nagios directory here, as plugins are # currently compatible %icinga2_plugindir %{_prefix}/lib/nagios/plugins # install all event handler scripts into this directory %icinga2_eventhandlerdir %{_prefix}/lib/icinga/eventhandler # files like p1.pl are located directly in this directory %icinga2_libdir %{_prefix}/lib/icinga2 # Icinga uses this directory for status files %icinga2_localstatedir %{_var}/lib/icinga2 # Icinga configuration should be stored here %icinga2_sysconfdir %{_sysconfdir}/icinga2 # Icinga static webpages, stylesheets and theme(s), online documentation %icinga2_datadir %{_datadir}/icinga2 # Icinga spool dir %icinga2_spooldir %{_var}/spool/icinga2 # Icinga run dir %icinga2_rundir %{_localstatedir}/run/icinga2 # Icinga logfile dir %icinga2_logdir %{_var}/log/icinga2 # Icinga cgi directory %icinga2_cgidir %{_prefix}/lib/icinga2/cgi # Icinga cgi logging directory %icinga2_cgi_logdir %{icinga2_logdir}/www # Icinga check results spool directory %icinga2_checkresultdir %{icinga2_spooldir}/checkresults # Icinga external command file directory %icinga2_cmd_filedir %{icinga2_rundir} # Icinga temp directory %icinga2_tempdir %{icinga2_rundir}/tmp # # files # # This is where the current status of all monitored services and # hosts is stored %icinga2_status_file %{icinga2_spooldir}/status.dat # This is the file that Icinga should use to store host and # service state information before it shuts down. %icinga2_state_retention_file %{icinga2_spooldir}/retention.dat # Icinga lock file %icinga2_lockfile %{icinga2_rundir}/icinga2.pid # Icinga ido2db lock file %icinga2_ido2db_lockfile %{icinga2_rundir}/ido2db.pid # Icinga external command file - the name icinga.cmd is static, only the # directory is configurable %icinga2_cmdfile %{icinga2_cmd_filedir}/icinga2.cmd %icinga2_command_file %{icinga2_cmdfile} # Icinga ido2db socket file %icinga2_ido2db_socketfile %{icinga2_rundir}/ido2db.sock # Icinga initscript error file %icinga2_chkfile %{icinga2_spooldir}/icinga2.chk # Icinga idomod tmp file %icinga2_idomod_tmpfile %{icinga_spooldir}/idomod.tmp # Icinga HTTP auth file %icinga2_http_authfile %{icinga_sysconfdir}/htpasswd.users # Icinga logrotate file %icinga2_logrotatefile %{_sysconfdir}/logrotate.d/icinga2 # Icinga temp file %icinga2_tempfile %{icinga2_rundir}/icinga2.tmp # # users and groups # # User, Icinga runs under %icinga_user icinga # Group, Icinga runs under %icinga_group icinga # User, that can execute commands via %{icinga_command_file} %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} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
