--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec 2021/11/05 11:11:27 1.7 +++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec 2022/12/11 01:45:54 1.18 @@ -1,10 +1,10 @@ -# $Id: smeserver-zabbix-server.spec,v 1.6 2021/11/01 14:22:18 brianr Exp $ +# $Id: smeserver-zabbix-server.spec,v 1.17 2022/12/10 20:45:27 jpp Exp $ # Authority: vip-ire # Name: Daniel Berteaud %define name smeserver-zabbix-server %define version 0.1 -%define release 25 +%define release 31 Summary: sme server integration of zabbix server and web front-end Name: %{name} Version: %{version} @@ -36,28 +36,91 @@ Patch18: smeserver-zabbix-server-0.1-Upd Patch19: smeserver-zabbix-server-0.1-Template-user-dot-ini-and-override-service-file-change-pid-in-conf-file.patch Patch20: smeserver-zabbix-server-0.1-Add-in-zabbix-conf-expansion-to-createlinks.patch Patch21: smeserver-zabbix-server-0.1-Switch-to-specific-php-fpm.patch +Patch22: smeserver-zabbix-server-0.1-bz11232-installSME10.patch +Patch23: smeserver-zabbix-server-0.1-bz10802-checkcert-telegram.patch +Patch24: smeserver-zabbix-server-0.1-bz11749-adminpass.patch +Patch25: smeserver-zabbix-server-0.1-bz12068-httpd24.patch +Patch26: smeserver-zabbix-server-0.1-bz12031-backup.patch +Patch27: smeserver-zabbix-server-0.1-z50.patch BuildArchitectures: noarch BuildRequires: e-smith-devtools BuildRoot: /var/tmp/%{name}-%{version} -Requires: e-smith-release >= 9.0 +Requires: e-smith-release >= 10.0 +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 Requires: fping -Obsoletes: zabbix-server Requires: zabbix-server-mysql >= 4.4.6 Requires: zabbix-web-mysql >= 4.4.6 Requires: zabbix-web >= 4.4.6 Requires: sendxmpp -Conflicts: smeserver-zabbix-proxy Requires: smeserver-remoteuseraccess -#Requires: smeserver-php-scl +# for telegram bot +Requires: python2-pysocks python-requests python2-requests-oauthlib +Obsoletes: zabbix-server +Conflicts: smeserver-zabbix-proxy AutoReqProv: no %description smserver integration of zabbix server and web front-end. -ZAbbix is an entreprise-class open source distributed monitoring +Zabbix is an entreprise-class open source distributed monitoring +solution + +%package z50 +%define provscl 5.0.30-1.el7 +#5.0.30-1 +Summary: SME Server integration of zabbix server 5.0 and web front-end using Remi SCLO +Group: Applications/Internet +#common +BuildArchitectures: noarch +BuildRequires: e-smith-devtools +Requires: e-smith-release >= 10.0 +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 +Requires: fping +Requires: zabbix-server-mysql >= 5.0.0 +#Requires: zabbix-web-mysql-scl >= 5.0.0 +#Requires: zabbix-web >= 5.0.0 +Requires: sendxmpp +Requires: smeserver-remoteuseraccess +# specific +#Provides: rh-php72-php-fpm rh-php72-php-mbstring rh-php72 rh-php72-php-mysqlnd rh-php72-php-gd rh-php72-php-xml rh-php72-php-ldap rh-php72-php-bcmath +Provides: zabbix-web-database-scl-php74 = %{provscl} +Provides: zabbix-web-deps-scl = %{provscl} +Provides: zabbix-web-deps-scl-php73 = %{provscl} +Requires: zabbix-web = %{provscl} +Requires: php74-php-mysqlnd php74 php74-php-gd php74-php-bcmath php74-php-mbstring php74-php-xml php74-php-ldap php74-php-fpm php74-php-mysqlnd + +%description z50 +SME Server integration of zabbix server 5.0 and web front-end using Remi SCLO. +Zabbix is an entreprise-class open source distributed monitoring solution %changelog +* Sat Dec 10 2022 Jean-Philippe Pialasse 0.1-31.sme +- original package build for Zabbix 5.0 using Remi SCLO [SME: ] + +* Mon Aug 01 2022 Jean-Philippe Pialasse 0.1-30.sme +- update to httpd 2.4 access syntax [SME: 12068] + thanks to Vasarhelyi Zsolt +- add to core backup [SME: 12031] + non rpm owned files in /etc/zabbix, /etc/zabbix/zabbix_agentd.conf.d/ + and /var/lib/zabbix/bin/ + +* Tue Nov 09 2021 Jean-Philippe Pialasse 0.1-29.sme +- set random password to Admin i fuser exists and password is zabbix [SME: 11749] + +* Mon Nov 08 2021 Jean-Philippe Pialasse 0.1-28.sme +- add check cert scripts and telegram [SME: 10802] + no template provided to use with + +* Sun Nov 07 2021 Jean-Philippe Pialasse 0.1-27.sme +- fix init sql, typo and reload deamon [SME: 11232] + +* Sun Nov 07 2021 Jean-Philippe Pialasse 0.1-26.sme +- fix session and log issue [SME: 11232] + fix mysql-init not launched + * Mon Nov 01 2021 BogusDateBot - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, by assuming the date is correct and changing the weekday. @@ -114,7 +177,7 @@ solution * Wed Dec 2 2009 Daniel B. 0.1-11 - Support several mysql DB patches -* Tue Mar 02 2009 Daniel B. 0.1-10 +* Tue Mar 03 2009 Daniel B. 0.1-10 - Add smeserver-remoteuseraccess as a dependencie (sudoers template problem) * Mon Mar 02 2009 Daniel B. 0.1-9 @@ -176,6 +239,12 @@ solution %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 %build perl ./createlinks @@ -192,26 +261,25 @@ rm -f %{name}-%{version}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /var/lib/zabbix/bin/fping 'attr(0750,root,zabbix)' \ --file /var/lib/zabbix/bin/fping6 'attr(0750,root,zabbix)' \ - --dir /var/lib/zabbix/tmp 'attr(0755,zabbix,zabbix)' \ + --dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \ + --dir /var/log/php/zabbix 'attr(0770,www,www)' \ + --dir /var/lib/php/zabbix 'attr(0755,root,www)' \ + --dir /var/lib/php/zabbix/tmp 'attr(0770,root,www)' \ + --dir /var/lib/php/zabbix/opcache 'attr(0770,root,www)' \ + --dir /var/lib/php/zabbix/session 'attr(0770,root,www)' \ + |grep -v '.pyc'|grep -v '.pyo' \ > %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist %defattr(-,root,root) +%files z50 -f %{name}-%{version}-filelist +%defattr(-,root,root) + %clean rm -rf $RPM_BUILD_ROOT %post -#/sbin/e-smith/expand-template /etc/e-smith/sql/init/80zabbix-server -#/etc/rc.d/init.d/mysql.init start %postun -#uninstall -#if [ $1 = 0 ] ; then -# /sbin/e-smith/db configuration setprop zabbix-server status disabled -# /etc/init.d/zabbix-server stop -# /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf -# /usr/bin/sv h /service/httpd-e-smith -#fi -true