--- rpms/smeserver-php/sme10/smeserver-php.spec	2020/11/10 04:07:46	1.18
+++ rpms/smeserver-php/sme10/smeserver-php.spec	2021/02/21 05:26:31	1.27
@@ -1,5 +1,5 @@
 %define version 3.0.0
-%define release 16
+%define release 24
 %define name smeserver-php
 
 
@@ -23,6 +23,11 @@ Patch9: smeserver-php-3.0.0-bz8787-phpma
 Patch10: smeserver-php-3.0.0-bz11014.sme-server.target.patch
 Patch11: smeserver-php-3.0.0-bz11087-webapps.patch
 Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch
+Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch
+Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch
+Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch
+Patch16: smeserver-php-3.0.0-bz11325-logging.patch
+Patch17: smeserver-php-3.0.0-bz11287-pooldir.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: x86_64
@@ -220,7 +225,11 @@ Manage PHP FPM pools, and switch between
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 perl createlinks
@@ -231,9 +240,15 @@ perl createlinks
 #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
 #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
 #enable by default
-%{__mkdir_p} root/%{_presetdir}
-echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
+#%{__mkdir_p} root/%{_presetdir}
+#echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
+
+#drop in systemd file
+%{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
+echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
+echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
 
+%{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
 for phpver in "55" "56" "70" "71" "72" "73" "74"; do
 #needed folder
 %{__mkdir_p} root/var/log/php/php$phpver/
@@ -248,9 +263,18 @@ echo 'service'> root/etc/e-smith/db/conf
 #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/
 #echo '' >  root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf
 
-#enable by default php fpm
-echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset
+##enable by default php fpm
+#echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset
 
+#logrotate templates
+echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
+MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm
+
+#drop in systemd file
+%{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
+echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
+echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
+ 
 done
 
 #to add a new php version
@@ -307,6 +331,35 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
+- allow php-pool-dirs to run from generik event [SME: 11287]
+
+* Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
+- fix php55 logrotate [SME: 11325]
+- cleanup remove services in sme-server.target.wants [SME: 10956]
+- remove usr/lib preset file from rpm [SME: 10958]
+
+* Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
+- add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
+
+* Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
+- Fix createlinks typo missing event links [SME: 11287]
+- Fix typo
+
+* Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme
+- Fix individual PHP version for ibay [SME: 11267]
+
+* Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-19.sme
+- fix wrong syntax = in place of eq [SME: 11173]
+  thanks to Terry Fage
+
+* Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-18.sme
+- fix logrotate error because parent directory has insecure permissions [SME: 11173]
+
+* Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-17.sme
+- fix warning: ~ action is deprecated with rsyslog [SME: 11015]
+- fix logrotate error because parent directory has insecure permissions [SME: 11173]
+
 * Mon Nov 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-16.sme
 - fix typo for upload_tmp_dir [SME: 11092]