--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec 2020/12/07 15:26:43 1.2 +++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec 2020/12/10 15:49:09 1.5 @@ -1,10 +1,10 @@ -# $Id: smeserver-zabbix-server.spec,v 1.1 2020/12/04 18:33:30 brianr Exp $ +# $Id: smeserver-zabbix-server.spec,v 1.4 2020/12/08 16:29:28 brianr Exp $ # Authority: vip-ire # Name: Daniel Berteaud %define name smeserver-zabbix-server %define version 0.1 -%define release 20 +%define release 23 Summary: sme server integration of zabbix server and web front-end Name: %{name} Version: %{version} @@ -33,6 +33,8 @@ Patch15: smeserver-zabbix-server-0.1-sme Patch16: smeserver-zabbix-server-0.1-SME10458-SenderFrequency.deprecated.patch Patch17: smeserver-zabbix-server-0.1-zabbix4.4.6.patch Patch18: smeserver-zabbix-server-0.1-Update-httpd-createlinks-and-adduser.ini.patch +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 BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -55,6 +57,15 @@ ZAbbix is an entreprise-class open sourc solution %changelog +* Thu Dec 10 2020 Brian Read 0.1-23.sme +- Add in post instructions to spec for SQL db creation [SME: 11232] + +* Tue Dec 08 2020 Brian Read 0.1-22.sme +- Add expand zabbix-server.conf and .user.ini to creatlinks update event [SME:11232] + +* Tue Dec 08 2020 Brian Read 0.1-21.sme +- Template-user-dot-ini-and-override-service-file-change-pid-in-conf-file [SME: 11232] + * Mon Dec 07 2020 Brian Read 0.1-20.sme - Import to SME10 tree [SME: 11232] - Update createlinks for systemd @@ -148,6 +159,8 @@ solution %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 +%patch20 -p1 %build perl ./createlinks @@ -169,6 +182,9 @@ rm -f %{name}-%{version}-filelist %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