smeserver/smeserver-php
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme

Browse Source 
- change key type from service to configuration [SME: 11367]
  cleanup older php and php-fpm keys
- set base php to php84 [SME: 12952]
  fix missing bits for php74 support
This commit is contained in:
Jean-Philippe Pialasse
2025-03-05 22:52:37 -05:00
parent d2789e5967
commit 4c21e412da
29 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
createlinks
View File

@@ -12,6 +12,7 @@ foreach $file (qw(/etc/php.ini
/etc/opt/remi/php81/php.ini
/etc/opt/remi/php82/php.ini
/etc/opt/remi/php83/php.ini
/etc/opt/remi/php84/php.ini
)){
templates2events($file, qw(
console-save
@@ -41,7 +42,7 @@ for $event (qw(smeserver-php-update webapps-update)){
templates2events($file, $event);
}
foreach $ver (qw( 72 73 74 80 81 82 83)){
foreach $ver (qw( 72 73 74 80 81 82 83 84)){
foreach $service ( "php$ver-php-fpm" ){
foreach $event (qw(webapps-update ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers )){
safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/$service");
@@ -70,12 +71,13 @@ foreach $file (qw( /etc/sysconfig/php-fpm
/etc/logrotate.d/php81-php-fpm
/etc/logrotate.d/php82-php-fpm
/etc/logrotate.d/php83-php-fpm
/etc/logrotate.d/php84-php-fpm
)){
templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update));
}
#php7*
foreach $ver (qw( 72 73 74 80 81 82 83)){
foreach $ver (qw( 72 73 74 80 81 82 83 84)){
foreach $file ( "/etc/opt/remi/php$ver/php-fpm.conf",
"/etc/opt/remi/php$ver/php-fpm.d/www.conf",
"/etc/opt/remi/php$ver/php-fpm.d/ibays.conf",

2
root/etc/e-smith/db/configuration/defaults/php/type
View File

@@ -1 +1 @@
service
configuraiton

1
root/etc/e-smith/db/configuration/defaults/php56-php-fpm/status
View File

@@ -1 +0,0 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/php56-php-fpm/type
View File

@@ -1 +0,0 @@
service

1
root/etc/e-smith/db/configuration/defaults/php56/AllowUrlFopen
View File

@@ -1 +0,0 @@
Off

1
root/etc/e-smith/db/configuration/defaults/php56/type
View File

@@ -1 +0,0 @@
configuration

1
root/etc/e-smith/db/configuration/defaults/php70-php-fpm/status
View File

@@ -1 +0,0 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/php70-php-fpm/type
View File

@@ -1 +0,0 @@
service

1
root/etc/e-smith/db/configuration/defaults/php70/AllowUrlFopen
View File

@@ -1 +0,0 @@
Off

1
root/etc/e-smith/db/configuration/defaults/php70/type
View File

@@ -1 +0,0 @@
configuration

1
root/etc/e-smith/db/configuration/defaults/php71-php-fpm/status
View File

@@ -1 +0,0 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/php71-php-fpm/type
View File

@@ -1 +0,0 @@
service

1
root/etc/e-smith/db/configuration/defaults/php71/AllowUrlFopen
View File

@@ -1 +0,0 @@
Off

1
root/etc/e-smith/db/configuration/defaults/php71/type
View File

@@ -1 +0,0 @@
configuration

0
root/etc/e-smith/db/configuration/defaults/php55-php-fpm/status → root/etc/e-smith/db/configuration/defaults/php84-php-fpm/status
View File

0
root/etc/e-smith/db/configuration/defaults/php55-php-fpm/type → root/etc/e-smith/db/configuration/defaults/php84-php-fpm/type
View File

0
root/etc/e-smith/db/configuration/defaults/php55/AllowUrlFopen → root/etc/e-smith/db/configuration/defaults/php84/AllowUrlFopen
View File

0
root/etc/e-smith/db/configuration/defaults/php55/type → root/etc/e-smith/db/configuration/defaults/php84/type
View File

10
root/etc/e-smith/db/configuration/migrate/smeserver-php Normal file
View File

@@ -0,0 +1,10 @@
{
foreach my $sservice (qw(php)) {
$DB->set_prop($sservice, "type", "configuration") if ${$sservice}{type} eq "service";
}
# delete old php entries
foreach my $sservice (qw(php55 php55-php-fpm php56 php56-php-fpm php70 php70-php-fpm php71 php71-php-fpm)) {
my $popd = $DB->get($sservice) or next;
$popd->delete;
}
}

1
root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php.ini
View File

@@ -1 +1,2 @@
TEMPLATE_PATH="/etc/php.ini"
MORE_DATA={ PHP_VERSION => 80, INCLUDE_PATH => ".:/opt/remi/php80/root/usr/share/pear:/opt/remi/php80/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php80/root/usr/lib64/php/modules" }

1
root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php.ini
View File

@@ -1 +1,2 @@
TEMPLATE_PATH="/etc/php.ini"
MORE_DATA={ PHP_VERSION => 81, INCLUDE_PATH => ".:/opt/remi/php81/root/usr/share/pear:/opt/remi/php81/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php81/root/usr/lib64/php/modules" }

1
root/etc/e-smith/templates.metadata/etc/opt/remi/php82/php.ini
View File

@@ -1 +1,2 @@
TEMPLATE_PATH="/etc/php.ini"
MORE_DATA={ PHP_VERSION => 82, INCLUDE_PATH => ".:/opt/remi/php82/root/usr/share/pear:/opt/remi/php82/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php82/root/usr/lib64/php/modules" }

1
root/etc/e-smith/templates.metadata/etc/opt/remi/php83/php.ini
View File

@@ -1 +1,2 @@
TEMPLATE_PATH="/etc/php.ini"
MORE_DATA={ PHP_VERSION => 83, INCLUDE_PATH => ".:/opt/remi/php83/root/usr/share/pear:/opt/remi/php83/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php83/root/usr/lib64/php/modules" }

2
root/etc/e-smith/templates.metadata/etc/opt/remi/php84/php.ini Normal file
View File

@@ -0,0 +1,2 @@
TEMPLATE_PATH="/etc/php.ini"
MORE_DATA={ PHP_VERSION => 84, INCLUDE_PATH => ".:/opt/remi/php84/root/usr/share/pear:/opt/remi/php84/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php84/root/usr/lib64/php/modules" }

2
root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
View File

@@ -1,5 +1,5 @@
for VER in php php72 php73 php74 php80 php81 php82 php83; do
for VER in php php72 php73 php74 php80 php81 php82 php83 php84; do
/usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
/usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
/usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache

2
root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
View File

@@ -18,6 +18,7 @@ $OUT = "/var/log/php/*/php*fpm.log {
/sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
/sbin/e-smith/service php82-php-fpm reload >/dev/null 2>&1 || true
/sbin/e-smith/service php83-php-fpm reload >/dev/null 2>&1 || true
/sbin/e-smith/service php84-php-fpm reload >/dev/null 2>&1 || true
endscript
}
@@ -37,6 +38,7 @@ $OUT = "/var/log/php/*/php*fpm.log {
/sbin/e-smith/service php81-php-fpm reload >/dev/null 2>&1 || true
/sbin/e-smith/service php82-php-fpm reload >/dev/null 2>&1 || true
/sbin/e-smith/service php83-php-fpm reload >/dev/null 2>&1 || true
/sbin/e-smith/service php84-php-fpm reload >/dev/null 2>&1 || true
endscript
}
";

2
root/etc/e-smith/templates/etc/rsyslog.conf/32php
View File

@@ -18,3 +18,5 @@
& stop
:programname, startswith, "php83-fpm" /var/log/php/php83/php83-fpm.log
& stop
:programname, startswith, "php84-fpm" /var/log/php/php84/php84-fpm.log
& stop

2
root/usr/share/perl5/vendor_perl/esmith/php.pm
View File

@@ -5,7 +5,7 @@ use warnings;
use esmith::ConfigDB;
our $PHPDEFAULT = 84;
our $BASEPHP = 83;
our $BASEPHP = 84;
our @ISA = qw(Exporter);
our @EXPORT = qw( listPHPVersionFPM listPHPVersionShort listPHPVersionHash listPHPVersionHashShort PHPdefault PHPbase VersionToUse PhpFpmVersionToUse $defaultdisabledfunc %defaultPHPproperties);

8
smeserver-php.spec
View File

@@ -1,5 +1,5 @@
%define version 11.0.0
%define release 15
%define release 16
%define name smeserver-php
%global debug_package %{nil}
@@ -303,6 +303,12 @@ rm -rf $RPM_BUILD_ROOT
%preun
%changelog
* Wed Mar 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
- change key type from service to configuration [SME: 11367]
cleanup older php and php-fpm keys
- set base php to php84 [SME: 12952]
fix missing bits for php74 support
* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
- move template-begin-ini to smeserver-lib [SME: 12211]