diff --git a/.zabbix.metadata b/.zabbix.metadata index ab5c3ea..54809de 100644 --- a/.zabbix.metadata +++ b/.zabbix.metadata @@ -1 +1 @@ -a44d034ad7f2dcf3ea17e79300ba986bbac33d96 SOURCES/zabbix-5.0.8.tar.gz +8362b5600c3cc5ca6fadfd82c6abea06bcf0d937 SOURCES/zabbix-5.0.10.tar.gz diff --git a/SOURCES/zabbix-nginx.conf b/SOURCES/zabbix-nginx.conf index 1b5eafb..3777526 100644 --- a/SOURCES/zabbix-nginx.conf +++ b/SOURCES/zabbix-nginx.conf @@ -30,8 +30,8 @@ server { location ~ [^/]\.php(/|$) { fastcgi_pass unix:/run/php-fpm/zabbix.sock; -# fastcgi_pass unix:/var/opt/rh/rh-php72/run/php-fpm/zabbix.sock -# fastcgi_pass unix:/var/opt/rh/rh-php73/run/php-fpm/zabbix.sock +# fastcgi_pass unix:/var/opt/rh/rh-php72/run/php-fpm/zabbix.sock; +# fastcgi_pass unix:/var/opt/rh/rh-php73/run/php-fpm/zabbix.sock; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; diff --git a/SOURCES/zabbix-proxy.service b/SOURCES/zabbix-proxy.service index 784783b..549830d 100644 --- a/SOURCES/zabbix-proxy.service +++ b/SOURCES/zabbix-proxy.service @@ -13,6 +13,7 @@ After=postgresql-9.6.service After=postgresql-10.service After=postgresql-11.service After=postgresql-12.service +After=postgresql-13.service [Service] Environment="CONFFILE=/etc/zabbix/zabbix_proxy.conf" diff --git a/SOURCES/zabbix-server.service b/SOURCES/zabbix-server.service index 9c56a31..11f83a6 100644 --- a/SOURCES/zabbix-server.service +++ b/SOURCES/zabbix-server.service @@ -13,6 +13,7 @@ After=postgresql-9.6.service After=postgresql-10.service After=postgresql-11.service After=postgresql-12.service +After=postgresql-13.service [Service] Environment="CONFFILE=/etc/zabbix/zabbix_server.conf" diff --git a/SOURCES/zabbix-web-fcgi.conf b/SOURCES/zabbix-web-fcgi.conf index e072800..7f5f73f 100644 --- a/SOURCES/zabbix-web-fcgi.conf +++ b/SOURCES/zabbix-web-fcgi.conf @@ -4,6 +4,8 @@ Alias /zabbix /usr/share/zabbix +ProxyTimeout 300 + Options FollowSymLinks AllowOverride None diff --git a/SOURCES/zabbix_java_gateway-sysd b/SOURCES/zabbix_java_gateway-sysd index ee8e332..ca1c695 100644 --- a/SOURCES/zabbix_java_gateway-sysd +++ b/SOURCES/zabbix_java_gateway-sysd @@ -47,6 +47,9 @@ fi if [ -n "$TIMEOUT" ]; then ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.timeout=$TIMEOUT" fi +if [ -n "$PROPERTIES_FILE" ]; then + ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dzabbix.propertiesFile=$PROPERTIES_FILE" +fi tcp_timeout=${TIMEOUT:=3}000 ZABBIX_OPTIONS="$ZABBIX_OPTIONS -Dsun.rmi.transport.tcp.responseTimeout=$tcp_timeout" diff --git a/SPECS/zabbix.spec b/SPECS/zabbix.spec index 57ca431..720ab31 100644 --- a/SPECS/zabbix.spec +++ b/SPECS/zabbix.spec @@ -1,5 +1,5 @@ Name: zabbix -Version: 5.0.8 +Version: 5.0.10 Release: %{?alphatag:0.}2%{?alphatag}%{?dist} Summary: The Enterprise-class open source monitoring solution Group: Applications/Internet @@ -1384,6 +1384,10 @@ fi # %changelog +* Tue Apr 06 2021 Fabian Arrotin - 5.0.10-1 +- bumped to upstream 5.0.10 version +- imported other upstream diff in sources files for systemd unit + * Thu Feb 04 2021 Fabian Arrotin - 5.0.8-2 - disabling agent2 build due to missing BuildRequires (not fetching GO from internet)