rpm/zabbix
SHA256
1
0
Fork 0
forked from pool/zabbix
Code Pull Requests Activity

Accepting request 1143962 from home:dirkmueller:Factory

Browse Source 
- add group provides needed by RPM 4.19

  + ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page
    entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs
  zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch
  zabbix-6.0.12-new-m4-pgsql.patch
- add CVE-2022-35230 patch file CVE-2022-35230.patch
 + ZBX-20680 Fixed reflected XSS issues
  + ZBX-19457 	Fixed failed query when updating application names longer than 255 characters
  + ZBX-8999 Fixed exporting of images separately from other objects
  + ZBX-18688 Fixed schema name didnt show when available only postgresql
  + ZBXNEXT-5903 Added vmware datacenters discovery
- New Features and Improvements:
  + ZBX-17390 Fixed validation of the maximum selected period
  + ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components
  + ZBX-16548 Fixed sort order in plain text screen
  + ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions
  + ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge
    period being overridden by global configuration
    and jqueryui v1.10.3 -> v1.12.1
    thanks to jose deniz for the patch
  + ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog
    metrics from an external Zabbix instance
  + ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form
    items vfs.dir.size[] and vfs.dir.count[]
    in item regexp preprocessing, general pcre code improvements
  + ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table
    remaining when zabbix daemon is terminated during startup
- fixed configuration paths

OBS-URL: https://build.opensuse.org/request/show/1143962
OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=52
This commit is contained in:
Boris Manojlovic 2024-03-22 07:36:38 +00:00 committed by Git OBS Bridge
parent f55aaafdd9
commit e8e04d7f0e
2 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
zabbix.changes
View File

@ -4,6 +4,11 @@ Tue Feb 20 12:05:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro. Allows to eliminate the usage of deprecated
%patchN.
-------------------------------------------------------------------
Sun Feb 4 09:27:45 UTC 2024 - Dirk Müller <dmueller@suse.com>
- add group provides needed by RPM 4.19
-------------------------------------------------------------------
Sun Dec 24 09:21:51 UTC 2023 - Boris Manojlovic <boris@steki.net>
@ -189,7 +194,7 @@ Tue Oct 17 20:03:33 UTC 2023 - Boris Manojlovic <boris@steki.net>
+ ZBX-22369 Fixed suffix interpretation in threshold values for "Top hosts" widget
+ ZBX-22825 Fixed Zabbix access to the first page for user with specific page access
+ ZBX-22867 Fixed import popup showing circle animation even if PHP code failed
+ ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page
+ ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page
-------------------------------------------------------------------
Thu Jul 20 20:54:15 UTC 2023 - Boris Manojlovic <boris@steki.net>
@ -285,7 +290,7 @@ Thu Jul 20 20:54:15 UTC 2023 - Boris Manojlovic <boris@steki.net>
+ ZBX-22461 Fixed incorrect sortable item positioning in Safari
+ ZBX-22469 Fixed SLI calculation for services having multiple alarms per second
+ ZBX-22859 Fixed validation of input parameters in action configuration form
-------------------------------------------------------------------
Mon May 15 16:46:46 UTC 2023 - Boris Manojlovic <boris@steki.net>
@ -330,7 +335,7 @@ Mon May 15 16:46:46 UTC 2023 - Boris Manojlovic <boris@steki.net>
+ ZBX-22538 Fixed popup menus disappearing on right-clicking links in them
+ ZBX-21583 Optimised preprocessing steps and added two graphs and dashboard in the Hadoop by HTTP template
+ ZBX-19375 Prevented the ability to set a duplicate value for the uuid parameter when updating any of template
entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs
entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs
in Proxmox VE by HTTP template
+ ZBX-21603 Optimised preprocessing steps in the Zookeeper by HTTP template
+ ZBX-21589 Optimised SQL queries and preprocessing steps
@ -485,8 +490,8 @@ Mon May 15 16:46:46 UTC 2023 - Boris Manojlovic <boris@steki.net>
Fri Jan 27 21:44:50 UTC 2023 - Boris Manojlovic <boris@steki.net>
- mention of patches added required...
zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch
zabbix-6.0.12-new-m4-pgsql.patch
zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch
zabbix-6.0.12-new-m4-pgsql.patch
-------------------------------------------------------------------
Fri Jan 20 18:42:28 UTC 2023 - Boris Manojlovic <boris@steki.net>
@ -500,7 +505,7 @@ Fri Jan 20 18:42:28 UTC 2023 - Boris Manojlovic <boris@steki.net>
-------------------------------------------------------------------
Fri Jul 22 23:14:21 UTC 2022 - Boris Manojlovic <boris@steki.net>
- add CVE-2022-35230 patch file CVE-2022-35230.patch
- add CVE-2022-35230 patch file CVE-2022-35230.patch
-------------------------------------------------------------------
Fri Jul 22 22:44:34 UTC 2022 - Boris Manojlovic <boris@steki.net>
@ -522,7 +527,7 @@ Thu Mar 17 09:40:55 UTC 2022 - Boris Manojlovic <boris@steki.net>
- updated to latest release 4.0.39
- Bug Fixes
+ ZBX-19789 Added SourceIP support to ldap simple checks
+ ZBX-20680 Fixed reflected XSS issues
+ ZBX-20680 Fixed reflected XSS issues
( Reflected XSSes in Zabbix Frontend (CVE-2022-24349, CVE-2022-24917, CVE-2022-24918, CVE-2022-24919) )
fixes for bsc#1196945 bsc#1196946 bsc#1196947
@ -559,7 +564,7 @@ Sat Jan 22 10:37:11 UTC 2022 - Boris Manojlovic <boris@steki.net>
+ ZBX-19428 Fixed high CPU usage and preprocessing workers exiting with
timeout when starting numerous poller, trapper and discoverer processes
+ ZBX-19510 Fixed re-reading of old Windows events for various Windows event system synchronization problems
+ ZBX-19457 Fixed failed query when updating application names longer than 255 characters
+ ZBX-19457 Fixed failed query when updating application names longer than 255 characters
-------------------------------------------------------------------
Tue Jan 11 10:35:51 UTC 2022 - Johannes Segitz <jsegitz@suse.com>
@ -605,7 +610,7 @@ Fri Aug 13 19:53:27 UTC 2021 - Boris Manojlovic <boris@steki.net>
+ ZBX-19300 Updated jquery version
+ ZBX-19139 Fixed memory errors in cmdline parsing on freebsd
+ ZBX-19359 Fixed error in logsource function due to empty source
+ ZBX-8999 Fixed exporting of images separately from other objects
+ ZBX-8999 Fixed exporting of images separately from other objects
-------------------------------------------------------------------
Thu Jun 24 09:46:42 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
@ -671,7 +676,7 @@ Wed Apr 14 13:32:26 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+ ZBX-18885 Fixed SNMP agent item not accepting values that are
bigger than 2KB
- Last update (4.0.28) also included a fix for CVE-2021-27927
-------------------------------------------------------------------
Thu Mar 4 21:23:58 UTC 2021 - Boris Manojlovic <boris@steki.net>
@ -716,7 +721,7 @@ Thu Mar 4 21:23:58 UTC 2021 - Boris Manojlovic <boris@steki.net>
+ ZBX-18423 Fixed inconsistent macro expansion with Oracle DB compared with other databases
+ ZBX-18219 Fixed custom multiplier preprocessing step validation to accept a string with macros
+ ZBX-18422 Fixed "server is not running" warning message width
+ ZBX-18688 Fixed schema name didnt show when available only postgresql
+ ZBX-18688 Fixed schema name didnt show when available only postgresql
-------------------------------------------------------------------
Fri Jan 15 08:30:14 UTC 2021 - Boris Manojlovic <boris@steki.net>
@ -784,7 +789,7 @@ Thu Jul 30 08:25:38 UTC 2020 - Boris Manojlovic <boris@steki.net>
- updated to latest release 4.0.23
- New Features and improvements
+ ZBXNEXT-6004 Added host info to vmware event message log
+ ZBXNEXT-5903 Added vmware datacenters discovery
+ ZBXNEXT-5903 Added vmware datacenters discovery
- Bug Fixes
+ ZBX-8081 Fixed 'cmdline' parameter truncation on solaris 11.3 and later
+ ZBX-18014 Fixed memory leak when action message does not have to be sent
@ -807,7 +812,7 @@ Sat Jul 18 20:46:25 UTC 2020 - Boris Manojlovic <boris@steki.net>
- updated to latest release 4.0.22
- Fixes CVE-2020-15803
- New Features and Improvements:
- New Features and Improvements:
+ ZBXNEXT-3588 Improved Zabbix server performance when evaluating
trigger, discovery, autoregistration and internal actions
+ ZBXNEXT-5922 Increased max configuration cache size limit to 64GB
@ -860,7 +865,7 @@ Sat Jul 18 20:46:25 UTC 2020 - Boris Manojlovic <boris@steki.net>
+ ZBX-17012 Fixed url validator to also accept relative urls
+ ZBX-17507 Fixed oracle query interpreted as a multistatement
+ ZBX-9387 Fixed incorrect maintenance calculations when dst changed to summer time
+ ZBX-17390 Fixed validation of the maximum selected period
+ ZBX-17390 Fixed validation of the maximum selected period
-------------------------------------------------------------------
Thu Apr 23 12:11:58 UTC 2020 - Boris Manojlovic <boris@steki.net>
@ -869,7 +874,7 @@ Thu Apr 23 12:11:58 UTC 2020 - Boris Manojlovic <boris@steki.net>
- replaced URL for source downloads to zabbix CDN network location
- New Features and improvements
+ ZBXNEXT-5649 Added name referencing support ('~' suffix) to jsonpath
+ ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components
+ ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components
- Bug Fixes
+ ZBX-17173 Improved windows agent build scripts
+ ZBX-17425 Fixed template.massupdate api macros update
@ -964,7 +969,7 @@ Thu Nov 28 10:27:02 UTC 2019 - Boris Manojlovic <boris@steki.net>
+ ZBX-10618 Fixed disappearing dependent trigger cells and rows in overview
+ ZBX-16596 Added handling of bom to detect encoding for vfs.file.contents, vfs.file.regex and vfs.file.regmatch
+ ZBX-16771 Fixed wrong tab number being remembered when several browser tabs are in use
+ ZBX-16548 Fixed sort order in plain text screen
+ ZBX-16548 Fixed sort order in plain text screen
-------------------------------------------------------------------
Wed Oct 30 08:58:50 UTC 2019 - Boris Manojlovic <boris@steki.net>
@ -973,7 +978,7 @@ Wed Oct 30 08:58:50 UTC 2019 - Boris Manojlovic <boris@steki.net>
- New Features and Improvements
+ ZBXNEXT-5481 Added support of {trigger.id} macro in trigger tags
+ ZBXNEXT-4746 Added "template server cisco ucs snmpv2" template
+ ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions
+ ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions
- Bug Fixes
+ ZBX-16605 Fixed accessibility of localstorage identifier if cookies are
made unaccessible for client side scripts
@ -1051,7 +1056,7 @@ Thu Aug 29 08:46:12 UTC 2019 - Boris Manojlovic <boris@steki.net>
+ ZBX-16316 Fixed dashboard widget and slideshow menu popup not
updating current refresh rate and fixed a js error in slideshows
+ ZBX-16346 Fixed compilation for oracle instant client v18.5 and higher
+ ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge
+ ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge
-------------------------------------------------------------------
Mon Aug 26 12:02:52 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
@ -1072,7 +1077,7 @@ Wed Aug 14 08:22:49 UTC 2019 - Boris Manojlovic <boris@steki.net>
- New Features and Improvements
- ZBXNEXT-4502,ZBXNEXT-5176 Added support of full jsonpath functionality
- ZBXNEXT-5205 Blocked zero item history/trends
period being overridden by global configuration
period being overridden by global configuration
- Bug Fixes
+ ZBX-16376 Fixed preprocessing steps having incorrect order
and duplicate step numbers
@ -1187,7 +1192,7 @@ Fri May 31 14:01:10 UTC 2019 - Boris Manojlovic <boris@steki.net>
- updated to latest release 4.0.8
- New Features and Improvements
+ ZBX-16069 Upgraded jquery version v1.10.2 -> v3.3.1
and jqueryui v1.10.3 -> v1.12.1
and jqueryui v1.10.3 -> v1.12.1
- Bug Fixes
+ ZBX-16032 Changed application filtering to partial name search
+ ZBX-15915 Fixed linking error if round() is undefined
@ -1346,7 +1351,7 @@ Wed Apr 24 14:07:54 UTC 2019 - Boris Manojlovic <boris@steki.net>
+ ZBX-15742 Fixed network discovery is not reacting to the changes
in agent configuration if uniqueness criteria is value
+ ZBX-15634 Fixed database monitor item does not use stored credentials;
thanks to jose deniz for the patch
thanks to jose deniz for the patch
-------------------------------------------------------------------
Mon Apr 1 08:45:14 UTC 2019 - Boris Manojlovic <boris@steki.net>
@ -1429,7 +1434,7 @@ Mon Apr 1 08:45:14 UTC 2019 - Boris Manojlovic <boris@steki.net>
+ ZBX-15539 fixed validation of master item in item update form
+ ZBX-15532 fixed undefined index error on problems page when trigger expression contains web items
+ ZBX-15488 fixed permission check for inherited triggers
+ ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog
+ ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog
-------------------------------------------------------------------
Mon Feb 25 20:07:06 UTC 2019 - Boris Manojlovic <boris@steki.net>
@ -1438,7 +1443,7 @@ Mon Feb 25 20:07:06 UTC 2019 - Boris Manojlovic <boris@steki.net>
- New Features and Improvements
+ ZBXNEXT-5046 added non-destructive resizing and reordering of dashboard widgets
+ ZBXNEXT-401, ZBXNEXT-4907, ZBXNEXT-4955 added monitoring of internal
metrics from an external Zabbix instance
metrics from an external Zabbix instance
- Bug Fixes
+ ZBXNEXT-4941 changed overflow statements to execute one
by one for Oracle for better performance
@ -1465,7 +1470,7 @@ Mon Feb 25 20:07:06 UTC 2019 - Boris Manojlovic <boris@steki.net>
reset to "1920" instead of DB default value when updating via edit form
+ ZBX-15271 added link to documentation in all man pages
+ ZBX-15422 fixed SQL errors when linked template have item prototype with equal key as host item
+ ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form
+ ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form
-------------------------------------------------------------------
Wed Feb 6 10:24:34 UTC 2019 - boris@steki.net
@ -1476,7 +1481,7 @@ Wed Feb 6 10:24:34 UTC 2019 - boris@steki.net
+ ZBXNEXT-4873 implemented single dot datasets to be drawn as points
in line vector graphs
+ ZBX-14876 added a new optional parameter <regex_excl_dir> to
items vfs.dir.size[] and vfs.dir.count[]
items vfs.dir.size[] and vfs.dir.count[]
+ ZBXNEXT-4792 added column "Latest values" in Monitoring->Problems and Dashboard
+ ZBX-15202 implemented widget pausing methods in dashboard; made graph widget
paused when using selection box or opening a tooltip
@ -1573,7 +1578,7 @@ Wed Feb 6 10:24:34 UTC 2019 - boris@steki.net
+ ZBX-15200 fixed host, trigger and item count calculation; fixed required performance calculation
+ ZBX-15158 fixed graph name for cache usage in proxy and server templates
+ ZBX-15178 fixed wrong behaviour when referencing unexisting capture groups
in item regexp preprocessing, general pcre code improvements
in item regexp preprocessing, general pcre code improvements
-------------------------------------------------------------------
Thu Nov 29 08:59:53 UTC 2018 - boris@steki.net
@ -1593,7 +1598,7 @@ Thu Nov 29 08:59:53 UTC 2018 - boris@steki.net
+ ZBXNEXT-4796 added 'fullscreen' and 'kiosk' URL arguments to allow to set layout mode via link
+ ZBXNEXT-4782 improve out of memory error message by adding statistics and backtrace;
improve something impossible has just happened error message by adding backtrace
+ ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table
+ ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table
- Bug Fixes
+ ZBX-15171 fixed crash in ODBC when creating JSON from null
db values, fixed memory leak
@ -1680,7 +1685,7 @@ Thu Nov 29 08:59:53 UTC 2018 - boris@steki.net
fixed debug element being hidden on widget refresh
+ ZBX-14806 changed focus style for radio buttons
+ ZBX-15027 fixed startup failures due to orphaned or zombie processes
remaining when zabbix daemon is terminated during startup
remaining when zabbix daemon is terminated during startup
+ ZBX-14904 fixed possible PHP errors in "Problem hosts" widget
+ ZBX-15057 fixed possible crash when syncing host groups
+ ZBX-14807 fixed selection box for graphs on monitoring screens
@ -1736,7 +1741,7 @@ Tue Oct 16 22:49:22 UTC 2018 - Boris Manojlovic <boris@steki.net>
- removed support for jabber protocol as iksemel was removed from
openSUSE:Factory
- fixed configuration paths
- fixed configuration paths
-------------------------------------------------------------------
Mon Oct 2 12:36:00 UTC 2018 - pieter@hollants.com

33
zabbix.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package zabbix
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,7 +28,7 @@ Release: 0
Summary: Distributed monitoring system
License: GPL-2.0-or-later
Group: System/Monitoring
URL: http://www.zabbix.com
URL: https://www.zabbix.com
Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz
Source1: rn6.0.0.html
Source2: zabbix-tmpfiles.conf
@ -60,9 +60,6 @@ BuildRequires: logrotate
BuildRequires: net-snmp-devel
BuildRequires: openldap2-devel
BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100
BuildRequires: postgresql-server-devel
%endif
BuildRequires: systemd-rpm-macros
BuildRequires: unixODBC-devel
BuildRequires: update-alternatives
@ -77,6 +74,9 @@ BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(zlib)
%{?systemd_requires}
%if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100
BuildRequires: postgresql-server-devel
%endif
%description
Zabbix is a distributed monitoring system.
@ -103,6 +103,7 @@ Requires: logrotate
Requires(pre): %fillup_prereq
Requires(pre): shadow
Conflicts: zabbix-agent
Provides: group(zabbix)
%description agent
The Zabbix agent monitors local resources and relays information to the server.
@ -117,6 +118,7 @@ Requires: zabbix_server_binary = %{version}-%{release}
Requires(pre): %fillup_prereq
Requires(pre): shadow
Conflicts: zabbix-server
Provides: group(zabbix)
%description server
The Zabbix server component.
@ -131,6 +133,7 @@ Requires: zabbix_proxy_binary = %{version}-%{release}
Requires(pre): %fillup_prereq
Requires(pre): shadow
Conflicts: zabbix-proxy
Provides: group(zabbix)
%description proxy
The Zabbix proxy component.
@ -165,7 +168,7 @@ Group: System/Monitoring
Requires: %{name}-server = %{version}-%{release}
Requires: mariadb
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-server-mysql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_server_binary = %{version}-%{release}
@ -179,7 +182,7 @@ Group: System/Monitoring
Requires: %{name}-server = %{version}-%{release}
Requires: postgresql
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-server-postgresql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_server_binary = %{version}-%{release}
@ -193,7 +196,7 @@ Group: System/Monitoring
Requires: %{name}-proxy = %{version}-%{release}
Requires: mariadb
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-proxy-mysql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_proxy_binary = %{version}-%{release}
@ -207,7 +210,7 @@ Group: System/Monitoring
Requires: %{name}-proxy = %{version}-%{release}
Requires: postgresql
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-proxy-postgresql
Provides: %{name} = %{version}-%{release}
Provides: zabbix_proxy_binary = %{version}-%{release}
@ -220,7 +223,7 @@ Summary: Zabbix proxy with SQLite support
Group: System/Monitoring
Requires: %{name}-proxy = %{version}-%{release}
Requires(post): update-alternatives
Requires(postun):update-alternatives
Requires(postun): update-alternatives
Conflicts: zabbix-proxy-sqlite
Provides: %{name} = %{version}-%{release}
Provides: zabbix_proxy_binary = %{version}-%{release}
@ -301,20 +304,20 @@ ZABBIX_BASIC_CONFIG="--enable-proxy --enable-server --enable-agent --sysconfdir
# configure MySQL repo (here)
autoreconf -fvi
%configure $ZABBIX_BASIC_CONFIG --with-mysql --without-postgresql --without-sqlite3
make %{?_smp_mflags}
%make_build
# configure PostgreSQL repo
cd ../zabbix-%{version}-postgresql
autoreconf -fvi
%configure $ZABBIX_BASIC_CONFIG --with-postgresql --without-mysql --without-sqlite3
make %{?_smp_mflags}
%make_build
cd -
# configure SQLite repo
cd ../zabbix-%{version}-sqlite
autoreconf -fvi
%configure $ZABBIX_BASIC_CONFIG --disable-server --enable-proxy --with-sqlite3 --without-postgresql --without-mysql
make %{?_smp_mflags}
%make_build
cd -
%install
@ -425,28 +428,24 @@ cp %{SOURCE15} .
%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group}
%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Server Daemon" -g %{server_group} %{server_user}
%service_add_pre zabbix_server.service
exit 0
%pre proxy
# Proxy daemon
%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group}
%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Proxy Daemon" -g %{server_group} %{server_user}
%service_add_pre zabbix_proxy.service
exit 0
%pre agent
# Agent daemon
%{_bindir}/getent group %{agent_group} >/dev/null || %{_sbindir}/groupadd -r %{agent_group}
%{_bindir}/getent passwd %{agent_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{agent_user} -s /bin/false -c "Zabbix Agent Daemon" -g %{agent_group} %{agent_user}
%service_add_pre zabbix_agentd.service
exit 0
%pre java-gateway
# Java daemon
%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group}
%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Java Daemon" -g %{server_group} %{server_user}
%service_add_pre zabbix-java-gateway.service
exit 0
%post server
%service_add_post zabbix_server.service