/[smeserver]/rpms/smeserver-php/sme10/smeserver-php.spec
ViewVC logotype

Diff of /rpms/smeserver-php/sme10/smeserver-php.spec

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

Revision 1.2 by jpp, Tue Jan 28 19:56:29 2020 UTC Revision 1.27 by jpp, Sun Feb 21 05:26:31 2021 UTC
# Line 1  Line 1 
1  %define version 3.0.0  %define version 3.0.0
2  %define release 1  %define release 24
3  %define name smeserver-php  %define name smeserver-php
4    
5    
# Line 10  Release: %{release}%{?dist} Line 10  Release: %{release}%{?dist}
10  License: MIT  License: MIT
11  Group: Applications/System  Group: Applications/System
12  Source: %{name}-%{version}.tar.gz  Source: %{name}-%{version}.tar.gz
13    Patch0: smeserver-php-fpm-0.1.1-bz10871-ibay-php-fpm.patch
14    Patch1: smeserver-php-fpm-0.1.1-bz10871-bz10335-fix1.patch
15    Patch2: smeserver-php-fpm-0.1.1-bz10879-php-fpm_syslog.patch
16    Patch3: smeserver-php-fpm-0.1.1-bz10877-pool-logs.patch
17    Patch4: smeserver-php-3.0.0-bz10888-sys_temp_dir.patch
18    Patch5: smeserver-php-fpm-0.1.1-bz0335-fix2.patch
19    Patch6: smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch
20    Patch7: smeserver-php-3.0.0-bz10891-php.ini-allversions.patch
21    Patch8: smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch
22    Patch9: smeserver-php-3.0.0-bz8787-phpmail.patch
23    Patch10: smeserver-php-3.0.0-bz11014.sme-server.target.patch
24    Patch11: smeserver-php-3.0.0-bz11087-webapps.patch
25    Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch
26    Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch
27    Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch
28    Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch
29    Patch16: smeserver-php-3.0.0-bz11325-logging.patch
30    Patch17: smeserver-php-3.0.0-bz11287-pooldir.patch
31    
32  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
33  BuildArch: x86_64  BuildArch: x86_64
# Line 18  BuildRequires: e-smith-devtools Line 36  BuildRequires: e-smith-devtools
36  Requires: e-smith-base >= 5.6.0  Requires: e-smith-base >= 5.6.0
37  Provides: e-smith-php = %{version}-%{release}  Provides: e-smith-php = %{version}-%{release}
38  Obsoletes: e-smith-php < %{version}  Obsoletes: e-smith-php < %{version}
39    Provides: smeserver-webapps-common
40    
41  Requires: tmpwatch  Requires: tmpwatch
42  Requires: logrotate  Requires: logrotate
# Line 193  Manage PHP FPM pools, and switch between Line 212  Manage PHP FPM pools, and switch between
212    
213  %prep  %prep
214  %setup -q -n %{name}-%{version}  %setup -q -n %{name}-%{version}
215    %patch0 -p1
216    %patch1 -p1
217    %patch2 -p1
218    %patch3 -p1
219    %patch4 -p1
220    %patch5 -p1
221    %patch6 -p1
222    %patch7 -p1
223    %patch8 -p1
224    %patch9 -p1
225    %patch10 -p1
226    %patch11 -p1
227    %patch12 -p1
228    %patch13 -p1
229    %patch14 -p1
230    %patch15 -p1
231    %patch16 -p1
232    %patch17 -p1
233    
234  %build  %build
235  perl createlinks  perl createlinks
# Line 203  perl createlinks Line 240  perl createlinks
240  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
241  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
242  #enable by default  #enable by default
243  %{__mkdir_p} root/%{_presetdir}  #%{__mkdir_p} root/%{_presetdir}
244  echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
245    
246    #drop in systemd file
247    %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
248    echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
249    echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
250    
251    %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
252  for phpver in "55" "56" "70" "71" "72" "73" "74"; do  for phpver in "55" "56" "70" "71" "72" "73" "74"; do
253  #needed folder  #needed folder
254  %{__mkdir_p} root/var/log/php/php$phpver/  %{__mkdir_p} root/var/log/php/php$phpver/
# Line 220  echo 'service'> root/etc/e-smith/db/conf Line 263  echo 'service'> root/etc/e-smith/db/conf
263  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/
264  #echo '' >  root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf  #echo '' >  root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf
265    
266  #enable by default php fpm  ##enable by default php fpm
267  echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset  #echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset
268    
269    #logrotate templates
270    echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
271    MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm
272    
273    #drop in systemd file
274    %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
275    echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
276    echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
277    
278  done  done
279    
280  #to add a new php version  #to add a new php version
281  #php5*  #php5*
282  for phpver in  "55" ; do  for phpver in  "55" ; do
283  #cp php56 metadata  #cp php56 metadata
284  cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56 root/etc/e-smith/templates.metadata/opt/remi/php$phpver  mkdir -p  root/etc/e-smith/templates.metadata/opt/remi/php$phpver
285    cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56/* root/etc/e-smith/templates.metadata/opt/remi/php$phpver
286  #sed inplace  #sed inplace
287  find root/etc/e-smith/templates.metadata/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g'  find root/etc/e-smith/templates.metadata/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g'
288  done  done
# Line 237  done Line 290  done
290  # php7*  # php7*
291  for phpver in  "72" "73" "74"; do  for phpver in  "72" "73" "74"; do
292  #cp ph70 metada  #cp ph70 metada
293  cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70 root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
294    cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
295  #sed inplace  #sed inplace
296  find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g'  find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g'
297  done  done
# Line 277  rm -rf $RPM_BUILD_ROOT Line 331  rm -rf $RPM_BUILD_ROOT
331  %preun  %preun
332    
333  %changelog  %changelog
334    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
335    - allow php-pool-dirs to run from generik event [SME: 11287]
336    
337    * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
338    - fix php55 logrotate [SME: 11325]
339    - cleanup remove services in sme-server.target.wants [SME: 10956]
340    - remove usr/lib preset file from rpm [SME: 10958]
341    
342    * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
343    - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
344    
345    * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
346    - Fix createlinks typo missing event links [SME: 11287]
347    - Fix typo
348    
349    * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme
350    - Fix individual PHP version for ibay [SME: 11267]
351    
352    * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-19.sme
353    - fix wrong syntax = in place of eq [SME: 11173]
354      thanks to Terry Fage
355    
356    * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-18.sme
357    - fix logrotate error because parent directory has insecure permissions [SME: 11173]
358    
359    * Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-17.sme
360    - fix warning: ~ action is deprecated with rsyslog [SME: 11015]
361    - fix logrotate error because parent directory has insecure permissions [SME: 11173]
362    
363    * Mon Nov 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-16.sme
364    - fix typo for upload_tmp_dir [SME: 11092]
365    
366    * Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-15.sme
367    - improve integration of webapps : virtualhost and event [SME: 11087]
368    
369    * Wed Sep 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-14.sme
370    - enable php services for sme-server.target [SME: 11014]
371    
372    * Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-13.sme
373    - move and fix link to start services units [SME: 10960]
374    
375    * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-12.sme
376    - fix typo in  smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch [SME: 10904]
377    
378    * Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-11.sme
379    - help monitoring email sent by php [SME: 8787]
380    
381    * Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-9.sme
382    - move auto_prepend_file from php.ini to php-fpm.d [SME: 10904]
383      add /usr/share/php in open_basedir if dfined to allow execution of auto_prepend_file
384    - fix templates-metadata path fot php 55 72 73 74
385    
386    * Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-8.sme
387    - transfer SERVER auth variables from httpd server to php-fpm pool [SME: 10904]
388      this allow easy auth for php app using httpd auth as if using php module
389    
390    * Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-7.sme
391    - templating all php.ini for all available version [SME: 10891]
392      expanded using webapps-update, smeserver-php-update, console-save and bootstrap-console-save
393      Values are those from php configuration key, unless defined for the php$VERSION key.
394      only one template for all, using templates.metadata and conditions vhen needed.
395      reworked the content of the php.ini to have it uptodate
396    
397    * Wed Mar 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-6.sme
398    - enable units for php-fpm services [SME: 10335]
399    
400    * Tue Mar 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-5.sme
401    - set sys_temp_dir for php-fpm and ibays [SME: 10888]
402    - set restart for php-fpm services in the smeserver-php-update event  [SME: 10335]
403    
404    * Mon Mar 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-3.sme
405    - fix typos and logic in scripts [SME: 10335]
406    - only set php admin values if php module is enabled [SME: 10871]
407    - redirect php*-php-fpm services logs to /var/log/php/php*/php-fpm.log [SME: 10879]
408    - pool logs in /var/log/php/*/error.log [SME: 10877]
409    
410    * Sat Feb 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-2.sme
411    - modification for ibays php-fpm support in httpd.conf [SME: 10871]
412    
413  * Tue Jan 28 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-1.sme  * Tue Jan 28 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-1.sme
414  - initial release of smeserver-php from smeserver-php-fpm [SME: 10335]  - initial release of smeserver-php from smeserver-php-fpm [SME: 10335]
415    added support for ibays, remove references to shares (should move to smeserver-share-folders)    added support for ibays, remove references to shares (should move to smeserver-share-folders)


Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed