/[smecontribs]/rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec

Diff of /rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.2 by brianr,
Mon Dec  7 15:26:43 2020 UTC
+Revision 1.8 by jpp,
Sun Nov  7 06:43:25 2021 UTC
 Line 1
- # $Id: smeserver-zabbix-server.spec,v 1.1 2020/12/04 18:33:30 brianr Exp $
+ # $Id: smeserver-zabbix-server.spec,v 1.7 2021/11/05 11:11:27 brianr Exp $
  # Authority: vip-ire
  # Name: Daniel Berteaud
  %define name smeserver-zabbix-server
  %define version 0.1
- %define release 20
+ %define release 26
  Summary: sme server integration of zabbix server and web front-end
  Name: %{name}
  Version: %{version}
 Line 33 
 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
+ Patch21: smeserver-zabbix-server-0.1-Switch-to-specific-php-fpm.patch
+ Patch22: smeserver-zabbix-server-0.1-bz11232-installSME10.patch
  BuildArchitectures: noarch
  BuildRequires: e-smith-devtools
-Line 55 
 ZAbbix is an entreprise-class open sourc
+Line 59 
 ZAbbix is an entreprise-class open sourc
  solution
  %changelog
+ * Sun Nov 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 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.
+   Tue Mar 02 2009 --> Tue Feb 24 2009 or Mon Mar 02 2009 or Tue Mar 03 2009 or ....
+   Wed Feb 07 2016 --> Wed Feb 03 2016 or Sun Feb 07 2016 or Wed Feb 10 2016 or ....
+ * Mon Nov 01 2021 Brian Read <brianr@bjsystems.co.uk> 0.1-25.sme
+ - Switch-to-specific-php-fpm [SME: 11232]
+ * Mon Nov 01 2021 Brian Read <brianr@bjsystems.co.uk> 0.1-24.sme
+ - Remove post and postun command in spec file [SME: 11232]
+ * Thu Dec 10 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-23.sme
+ - Add in post instructions to spec for SQL db creation [SME: 11232]
+ * Tue Dec 08 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-22.sme
+ - Add expand zabbix-server.conf and .user.ini to creatlinks update event [SME:11232]
+ * Tue Dec 08 2020 Brian Read <brianr@bjsystems.co.uk> 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 <brianr@bjsystems.co.uk> 0.1-20.sme
  - Import to SME10 tree [SME: 11232]
  - Update createlinks for systemd
-Line 77 
 solution
+Line 106 
 solution
  - fix php requirement
  - fix add path to new db
- * Wed Feb 7 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 0.1-14.sme
+ * Sun Feb 07 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 0.1-14.sme
+   Wed Feb 07 2016 --> Wed Feb 03 2016 or Sun Feb 07 2016 or Wed Feb 10 2016 or ....
  - New roll for sme9
  * Mon Apr 29 2013 Daniel B. <daniel@firewall-services.com> 0.1-13
-Line 148 
 solution
+Line 178 
 solution
  %patch16 -p1
  %patch17 -p1
  %patch18 -p1
+ %patch19 -p1
+ %patch20 -p1
+ %patch21 -p1
+ %patch22 -p1
  %build
  perl ./createlinks
  %{__mkdir_p} root/var/lib/zabbix/tmp
+ #%{__mkdir_p} root/var/log/zabbix - conflict with zabbix-server-mysql
+ %{__mkdir_p} root/var/log/php/zabbix
+ %{__mkdir_p} root/var/lib/php/zabbix/{tmp,wsdlcache,opcache,session}
  %install
  rm -rf $RPM_BUILD_ROOT
-Line 160 
 rm -f %{name}-%{version}-filelist
+Line 198 
 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)' \
          > %{name}-%{version}-filelist
  %files -f %{name}-%{version}-filelist
-Line 169 
 rm -f %{name}-%{version}-filelist
+Line 212 
 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
- if [ $1 = 0 ] ; then
+ #if [ $1 = 0 ] ; then
-  /sbin/e-smith/db configuration setprop zabbix-server status disabled
+ # /sbin/e-smith/db configuration setprop zabbix-server status disabled
-  /etc/init.d/zabbix-server stop
+ # /etc/init.d/zabbix-server stop
-  /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
+ # /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-  /usr/bin/sv h /service/httpd-e-smith
+ # /usr/bin/sv h /service/httpd-e-smith
- fi
+ #fi
  true

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1