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