* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- remove last references to php <7.2 [SME: 12550]
This commit is contained in:
parent
d24cc60735
commit
dd31b87a4e
39
createlinks
39
createlinks
@ -5,10 +5,6 @@ my $ver; my $service; my $file; my $event;
|
||||
|
||||
#old e-smith-php
|
||||
foreach $file (qw(/etc/php.ini
|
||||
/opt/remi/php55/root/etc/php.ini
|
||||
/opt/remi/php56/root/etc/php.ini
|
||||
/etc/opt/remi/php70/php.ini
|
||||
/etc/opt/remi/php71/php.ini
|
||||
/etc/opt/remi/php72/php.ini
|
||||
/etc/opt/remi/php73/php.ini
|
||||
/etc/opt/remi/php74/php.ini
|
||||
@ -45,7 +41,7 @@ for $event (qw(smeserver-php-update webapps-update)){
|
||||
templates2events($file, $event);
|
||||
}
|
||||
|
||||
foreach $ver (qw( 55 56 70 71 72 73 74 80 81 82 83)){
|
||||
foreach $ver (qw( 72 73 74 80 81 82 83)){
|
||||
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");
|
||||
@ -67,11 +63,6 @@ foreach $file (qw( /etc/php-fpm.conf
|
||||
|
||||
foreach $file (qw( /etc/sysconfig/php-fpm
|
||||
/etc/logrotate.d/php-fpm
|
||||
/etc/logrotate.d/php55-php-fpm
|
||||
/etc/logrotate.d/php56-php-fpm
|
||||
/etc/logrotate.d/php70-php-fpm
|
||||
/etc/logrotate.d/php70-php-fpm
|
||||
/etc/logrotate.d/php71-php-fpm
|
||||
/etc/logrotate.d/php72-php-fpm
|
||||
/etc/logrotate.d/php73-php-fpm
|
||||
/etc/logrotate.d/php74-php-fpm
|
||||
@ -83,23 +74,8 @@ foreach $file (qw( /etc/sysconfig/php-fpm
|
||||
templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update));
|
||||
}
|
||||
|
||||
#php5*
|
||||
foreach $ver (qw( 55 56 )){
|
||||
foreach $file ( "/opt/remi/php$ver/root/etc/php-fpm.conf",
|
||||
"/opt/remi/php$ver/root/etc/php-fpm.d/www.conf",
|
||||
"/opt/remi/php$ver/root/etc/php-fpm.d/ibays.conf",
|
||||
"/opt/remi/php$ver/root/etc/php-fpm.d/custom.conf" ){
|
||||
templates2events($file, qw(webapps-update bootstrap-console-save ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers smeserver-php-update));
|
||||
#safe_symlink('/etc/e-smith/templates-default/template-begin-ini', "root/etc/e-smith/templates$file/template-begin");
|
||||
}
|
||||
foreach $file ( "/opt/remi/php$ver/root/etc/sysconfig/php-fpm" ){
|
||||
templates2events($file, qw(webapps-update bootstrap-console-save));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#php7*
|
||||
foreach $ver (qw( 70 71 72 73 74 80 81 82 83)){
|
||||
foreach $ver (qw( 72 73 74 80 81 82 83)){
|
||||
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",
|
||||
@ -122,17 +98,6 @@ foreach my $event (qw( ibay-create ibay-delete ibay-modify ibay-modify-files iba
|
||||
event_link( "php-pool-customs", $event, "90");
|
||||
}
|
||||
|
||||
|
||||
# systemd units
|
||||
#foreach $ver (qw( 55 56 70 71 72 73 74 )){
|
||||
#$service = "php$ver-php-fpm.service";
|
||||
#safe_symlink("../$service", "root/usr/lib/systemd/system/multi-user.target.wants/$service");
|
||||
#safe_symlink("../$service", "root/usr/lib/systemd/system/sme-server.target.wants/$service");
|
||||
#}
|
||||
#$service = "php-fpm.service";
|
||||
#safe_symlink("../$service", "root/usr/lib/systemd/system/multi-user.target.wants/$service");
|
||||
#safe_symlink("../$service", "root/usr/lib/systemd/system/sme-server.target.wants/$service");
|
||||
|
||||
#webapps
|
||||
$event = 'webapps-update';
|
||||
templates2events("/etc/my.cnf", $event);
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.conf"
|
||||
MORE_DATA={ PHP_VERSION => 70, FPM_POOL_DIR => "/etc/opt/remi/php70/php-fpm.d" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
|
||||
MORE_DATA={ PHP_VERSION => 70 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/ibays.conf"
|
||||
MORE_DATA={ PHP_VERSION => 70 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
|
||||
MORE_DATA={ PHP_VERSION => 70 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php.ini"
|
||||
MORE_DATA={ PHP_VERSION => 70, INCLUDE_PATH => ".:/opt/remi/php70/root/usr/share/pear:/opt/remi/php70/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php70/root/usr/lib64/php/modules" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/sysconfig/php-fpm"
|
||||
MORE_DATA={ PHP_VERSION => 70 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.conf"
|
||||
MORE_DATA={ PHP_VERSION => 71, FPM_POOL_DIR => "/etc/opt/remi/php71/php-fpm.d" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
|
||||
MORE_DATA={ PHP_VERSION => 71 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/ibays.conf"
|
||||
MORE_DATA={ PHP_VERSION => 71 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
|
||||
MORE_DATA={ PHP_VERSION => 71 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php.ini"
|
||||
MORE_DATA={ PHP_VERSION => 71, INCLUDE_PATH => ".:/opt/remi/php70/root/usr/share/pear:/opt/remi/php71/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php71/root/usr/lib64/php/modules" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/sysconfig/php-fpm"
|
||||
MORE_DATA={ PHP_VERSION => 71 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php.ini"
|
||||
MORE_DATA={ PHP_VERSION => 55, INCLUDE_PATH => ".:/opt/remi/php55/root/usr/share/pear:/opt/remi/php55/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php55/root/usr/lib64/php/modules" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.conf"
|
||||
MORE_DATA={ PHP_VERSION => 56, FPM_POOL_DIR => "/opt/remi/php56/root/etc/php-fpm.d" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
|
||||
MORE_DATA={ PHP_VERSION => 56 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/ibays.conf"
|
||||
MORE_DATA={ PHP_VERSION => 56 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
|
||||
MORE_DATA={ PHP_VERSION => 56 }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/php.ini"
|
||||
MORE_DATA={ PHP_VERSION => 56, INCLUDE_PATH => ".:/opt/remi/php56/root/usr/share/pear:/opt/remi/php56/root/usr/share/php:/usr/share/php:/usr/share/pear", EXTENSION_DIR => "/opt/remi/php56/root/usr/lib64/php/modules" }
|
||||
@ -1,2 +0,0 @@
|
||||
TEMPLATE_PATH="/etc/sysconfig/php-fpm"
|
||||
MORE_DATA={ PHP_VERSION => 56 }
|
||||
@ -1,5 +1,5 @@
|
||||
|
||||
for VER in php php55 php56 php70 php71 php72 php73 php74 php80 php81 php82 php83; do
|
||||
for VER in php php72 php73 php74 php80 php81 php82 php83; 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
|
||||
|
||||
@ -11,10 +11,6 @@ $OUT = "/var/log/php/*/php*fpm.log {
|
||||
create 600 root root
|
||||
postrotate
|
||||
/sbin/e-smith/service php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php55-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php70-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php71-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
|
||||
@ -34,10 +30,6 @@ $OUT = "/var/log/php/*/php*fpm.log {
|
||||
create 600 www www
|
||||
postrotate
|
||||
/sbin/e-smith/service php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php55-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php70-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php71-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
|
||||
/sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
|
||||
|
||||
@ -28,12 +28,9 @@ highlight.bg = #FFFFFF
|
||||
highlight.default = #0000BB
|
||||
highlight.html = #000000
|
||||
zend.enable_gc = On
|
||||
zend.assertions = -1
|
||||
{
|
||||
return "" if $PHP_VERSION eq "";
|
||||
if ( $PHP_VERSION >= 70)
|
||||
{
|
||||
$OUT .="zend.assertions = -1\n";
|
||||
}
|
||||
if ( $PHP_VERSION >= 74)
|
||||
{
|
||||
$OUT .="zend.exception_ignore_args = On\n";
|
||||
|
||||
@ -1,8 +1,2 @@
|
||||
[Pcre]
|
||||
{
|
||||
return "" if $PHP_VERSION eq "";
|
||||
if ( $PHP_VERSION >= 70)
|
||||
{
|
||||
$OUT .="pcre.jit = Off\n";
|
||||
}
|
||||
}
|
||||
pcre.jit = Off
|
||||
|
||||
@ -22,26 +22,13 @@ session.cache_limiter = nocache
|
||||
session.cache_expire = 180
|
||||
session.use_trans_sid = On
|
||||
url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
|
||||
session.use_strict_mode = Off
|
||||
session.sid_bits_per_character = 4
|
||||
session.sid_length = 32
|
||||
session.trans_sid_tags = "a=href,area=href,frame=src,form="
|
||||
{
|
||||
return "" if $PHP_VERSION eq "";
|
||||
if ( $PHP_VERSION >= 55)
|
||||
{
|
||||
$OUT .= "session.use_strict_mode = Off\n";
|
||||
$OUT .= "sys_temp_dir = /var/lib/php/php$PHP_VERSION/tmp\n";
|
||||
}
|
||||
if ( $PHP_VERSION < 71)
|
||||
{
|
||||
$OUT .= "session.hash_bits_per_character = 5
|
||||
session.hash_function = 0
|
||||
session.entropy_file =
|
||||
session.entropy_length = 0\n";
|
||||
}
|
||||
if ( $PHP_VERSION >= 71)
|
||||
{
|
||||
$OUT .= "session.sid_bits_per_character = 4
|
||||
session.sid_length = 32
|
||||
session.trans_sid_tags = \"a=href,area=href,frame=src,form=\"\n";
|
||||
}
|
||||
$OUT .= "sys_temp_dir = /var/lib/php/php$PHP_VERSION/tmp\n";
|
||||
if ( $PHP_VERSION >= 73)
|
||||
{
|
||||
$OUT .= "session.cookie_samesite = \"Strict\"\n";
|
||||
|
||||
@ -4,14 +4,6 @@
|
||||
& stop
|
||||
:programname, startswith, "php-fpm" /var/log/php/php/php-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php55-fpm" /var/log/php/php55/php55-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php56-fpm" /var/log/php/php56/php56-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php70-fpm" /var/log/php/php70/php70-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php71-fpm" /var/log/php/php71/php71-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php72-fpm" /var/log/php/php72/php72-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php73-fpm" /var/log/php/php73/php73-fpm.log
|
||||
@ -25,4 +17,4 @@
|
||||
:programname, startswith, "php82-fpm" /var/log/php/php82/php82-fpm.log
|
||||
& stop
|
||||
:programname, startswith, "php83-fpm" /var/log/php/php83/php83-fpm.log
|
||||
& stop
|
||||
& stop
|
||||
|
||||
@ -4,8 +4,8 @@ use strict;
|
||||
use warnings;
|
||||
use esmith::ConfigDB;
|
||||
|
||||
our $PHPDEFAULT = 74;
|
||||
our $BASEPHP = 54;
|
||||
our $PHPDEFAULT = 82;
|
||||
our $BASEPHP = 81;
|
||||
|
||||
our @ISA = qw(Exporter);
|
||||
our @EXPORT = qw( listPHPVersionFPM listPHPVersionShort listPHPVersionHash listPHPVersionHashShort PHPdefault PHPbase VersionToUse PhpFpmVersionToUse $defaultdisabledfunc %defaultPHPproperties);
|
||||
@ -52,10 +52,6 @@ param = (enabled, disabled, all) , if empty default to all
|
||||
this will return you an array of php-fpm versions available php version
|
||||
print "'$_'\n" for listPHPVersionFPM('all');
|
||||
'php-fpm'
|
||||
'php55-php-fpm'
|
||||
'php56-php-fpm'
|
||||
'php70-php-fpm'
|
||||
'php71-php-fpm'
|
||||
'php72-php-fpm'
|
||||
'php73-php-fpm'
|
||||
'php74-php-fpm'
|
||||
@ -89,11 +85,6 @@ param2 = will use "" as output for base php
|
||||
|
||||
this will return you an array of numerical available php version
|
||||
print "'$_'\n" for listPHPVersionShort('all');
|
||||
'54'
|
||||
'55'
|
||||
'56'
|
||||
'70'
|
||||
'71'
|
||||
'72'
|
||||
'73'
|
||||
'74'
|
||||
@ -121,11 +112,6 @@ param2 = if defined will use "" as key for php-fpm
|
||||
this will return you a hash order by version
|
||||
my %list= listPHPVersionHash();
|
||||
print "$_ => $list{$_}\n" for (sort keys %list);
|
||||
54 => php-fpm
|
||||
55 => php55-php-fpm
|
||||
56 => php56-php-fpm
|
||||
70 => php70-php-fpm
|
||||
71 => php71-php-fpm
|
||||
72 => php72-php-fpm
|
||||
73 => php73-php-fpm
|
||||
74 => php74-php-fpm
|
||||
@ -155,11 +141,6 @@ param2 = if defined will use "" as key for php-fpm
|
||||
this will return you a hash order by version
|
||||
my %list= listPHPVersionHashShort();
|
||||
print "$_ => $list{$_}\n" for (sort keys %list);
|
||||
54 => php
|
||||
55 => php55
|
||||
56 => php56
|
||||
70 => php70
|
||||
71 => php71
|
||||
72 => php72
|
||||
73 => php73
|
||||
74 => php74
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
%define version 11.0.0
|
||||
%define release 3
|
||||
%define release 4
|
||||
%define name smeserver-php
|
||||
%global debug_package %{nil}
|
||||
|
||||
@ -281,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%preun
|
||||
|
||||
%changelog
|
||||
* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
|
||||
- remove last references to php <7.2 [SME: 12550]
|
||||
|
||||
* Sat Mar 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
|
||||
- drop support for php < 7.2 [SME: 12521]
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user