fix(suse): update to php8
Modern openSUSE distributions no longer ship PHP 5 - set defaults to PHP 8 instead. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
9c69a4e906
commit
55d15459bd
GPG Key ID:
1ED2F138E7E6FF57
@ -140,7 +140,7 @@ Installs the php-cache-lite package.
|
|||||||
^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^
|
||||||
|
|
||||||
Installs the php-cgi package.
|
Installs the php-cgi package.
|
||||||
Disabled on opensuse only php5-fastcgi available.
|
Disabled on openSUSE, as there is only php-fastcgi available.
|
||||||
|
|
||||||
``php.cli``
|
``php.cli``
|
||||||
^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^
|
||||||
|
|||||||
@ -3000,47 +3000,43 @@
|
|||||||
},
|
},
|
||||||
'Suse': {
|
'Suse': {
|
||||||
'pkgs': {
|
'pkgs': {
|
||||||
'adodb': 'php5-dba',
|
'adodb': 'php8-dba',
|
||||||
'apache2': 'apache2-mod_php5',
|
'apache2': 'apache2-mod_php8',
|
||||||
'cli': 'php5',
|
'cli': 'php8',
|
||||||
'curl': 'php5-curl',
|
'curl': 'php8-curl',
|
||||||
'fpm': 'php5-fpm',
|
'fpm': 'php8-fpm',
|
||||||
'gd': 'php5-gd',
|
'gd': 'php8-gd',
|
||||||
'imap': 'php5-imap',
|
'imap': 'php8-imap',
|
||||||
'intl': 'php5-intl',
|
'intl': 'php8-intl',
|
||||||
'json': 'php5-json',
|
'json': 'php8-json',
|
||||||
'ldap': 'php5-ldap',
|
'ldap': 'php8-ldap',
|
||||||
'mbstring': 'php5-mbstring',
|
'mbstring': 'php8-mbstring',
|
||||||
'mcrypt': 'php5-mcrypt',
|
'mcrypt': 'php8-mcrypt',
|
||||||
'mysql': 'php5-mysql',
|
'mysql': 'php8-mysql',
|
||||||
'oauth': 'php5-oauth',
|
'oauth': 'php8-oauth',
|
||||||
'pear': 'php5-pear',
|
'pear': 'php8-pear',
|
||||||
'pgsql': 'php5-pgsql',
|
'pgsql': 'php8-pgsql',
|
||||||
'php': 'php5',
|
'php': 'php8',
|
||||||
'snmp': 'php5-snmp',
|
'snmp': 'php8-snmp',
|
||||||
'soap': 'php5-soap',
|
'soap': 'php8-soap',
|
||||||
'sqlite': 'php5-sqlite',
|
'sqlite': 'php8-sqlite',
|
||||||
'suhosin': 'php5-suhosin',
|
'suhosin': 'php8-suhosin',
|
||||||
'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'],
|
'xml': ['php8-xmlreader','php8-xmlwriter','php8-xmlrpc'],
|
||||||
'zip': 'php5-zip',
|
'zip': 'php8-zip',
|
||||||
},
|
},
|
||||||
'fpm': {
|
'fpm': {
|
||||||
'conf': '/etc/php-fpm.conf',
|
'conf': '/etc/php8/fpm/php-fpm.conf',
|
||||||
'ini': '/etc/php.ini',
|
'ini': '/etc/php8/conf.d/salt.ini',
|
||||||
'pools': '/etc/php-fpm.d',
|
'pools': '/etc/php8/fpm/php-fpm.d',
|
||||||
'service': 'php-fpm',
|
'service': 'php-fpm',
|
||||||
'user': 'root',
|
'user': 'root',
|
||||||
'group': 'root',
|
'group': 'root',
|
||||||
'defaults': {
|
'defaults': {
|
||||||
'global': {
|
'include': '/etc/php8/fpm/php-fpm.d/*.conf',
|
||||||
'pid': '/var/run/php-fpm/php-fpm.pid',
|
|
||||||
'error_log': '/var/log/php-fpm/error.log',
|
|
||||||
},
|
|
||||||
'include': '/etc/php-fpm.d/*.conf',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'cli': {
|
'cli': {
|
||||||
'ini': '/etc/php.ini',
|
'ini': '/etc/php8/cli/php.ini',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'Arch': {
|
'Arch': {
|
||||||
|
|||||||
@ -35,7 +35,7 @@ control 'Php package' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_suse
|
def test_suse
|
||||||
describe package('php7') do
|
describe package('php8') do
|
||||||
it { should be_installed }
|
it { should be_installed }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -199,46 +199,43 @@ values:
|
|||||||
soap.wsdl_cache_ttl: 86400
|
soap.wsdl_cache_ttl: 86400
|
||||||
lookup:
|
lookup:
|
||||||
cli:
|
cli:
|
||||||
ini: /etc/php.ini
|
ini: /etc/php8/cli/php.ini
|
||||||
fpm:
|
fpm:
|
||||||
conf: /etc/php-fpm.conf
|
conf: /etc/php8/fpm/php-fpm.conf
|
||||||
defaults:
|
defaults:
|
||||||
global:
|
include: /etc/php8/fpm/php-fpm.d/*.conf
|
||||||
error_log: /var/log/php-fpm/error.log
|
|
||||||
pid: /var/run/php-fpm/php-fpm.pid
|
|
||||||
include: /etc/php-fpm.d/*.conf
|
|
||||||
group: root
|
group: root
|
||||||
ini: /etc/php.ini
|
ini: /etc/php8/conf.d/salt.ini
|
||||||
pools: /etc/php-fpm.d
|
pools: /etc/php8/fpm/php-fpm.d
|
||||||
service: php-fpm
|
service: php-fpm
|
||||||
user: root
|
user: root
|
||||||
pkgs:
|
pkgs:
|
||||||
adodb: php5-dba
|
adodb: php8-dba
|
||||||
apache2: apache2-mod_php5
|
apache2: apache2-mod_php8
|
||||||
cli: php5
|
cli: php8
|
||||||
curl: php5-curl
|
curl: php8-curl
|
||||||
fpm: php5-fpm
|
fpm: php8-fpm
|
||||||
gd: php5-gd
|
gd: php8-gd
|
||||||
imap: php5-imap
|
imap: php8-imap
|
||||||
intl: php5-intl
|
intl: php8-intl
|
||||||
json: php5-json
|
json: php8-json
|
||||||
ldap: php5-ldap
|
ldap: php8-ldap
|
||||||
mbstring: php5-mbstring
|
mbstring: php8-mbstring
|
||||||
mcrypt: php5-mcrypt
|
mcrypt: php8-mcrypt
|
||||||
mysql: php5-mysql
|
mysql: php8-mysql
|
||||||
oauth: php5-oauth
|
oauth: php8-oauth
|
||||||
pear: php5-pear
|
pear: php8-pear
|
||||||
pgsql: php5-pgsql
|
pgsql: php8-pgsql
|
||||||
php: php7
|
php: php8
|
||||||
snmp: php5-snmp
|
snmp: php8-snmp
|
||||||
soap: php5-soap
|
soap: php8-soap
|
||||||
sqlite: php5-sqlite
|
sqlite: php8-sqlite
|
||||||
suhosin: php5-suhosin
|
suhosin: php8-suhosin
|
||||||
xml:
|
xml:
|
||||||
- php5-xmlreader
|
- php8-xmlreader
|
||||||
- php5-xmlwriter
|
- php8-xmlwriter
|
||||||
- php5-xmlrpc
|
- php8-xmlrpc
|
||||||
zip: php5-zip
|
zip: php8-zip
|
||||||
xcache:
|
xcache:
|
||||||
ini:
|
ini:
|
||||||
defaults:
|
defaults:
|
||||||
|
|||||||
@ -199,46 +199,43 @@ values:
|
|||||||
soap.wsdl_cache_ttl: 86400
|
soap.wsdl_cache_ttl: 86400
|
||||||
lookup:
|
lookup:
|
||||||
cli:
|
cli:
|
||||||
ini: /etc/php.ini
|
ini: /etc/php8/cli/php.ini
|
||||||
fpm:
|
fpm:
|
||||||
conf: /etc/php-fpm.conf
|
conf: /etc/php8/fpm/php-fpm.conf
|
||||||
defaults:
|
defaults:
|
||||||
global:
|
include: /etc/php8/fpm/php-fpm.d/*.conf
|
||||||
error_log: /var/log/php-fpm/error.log
|
|
||||||
pid: /var/run/php-fpm/php-fpm.pid
|
|
||||||
include: /etc/php-fpm.d/*.conf
|
|
||||||
group: root
|
group: root
|
||||||
ini: /etc/php.ini
|
ini: /etc/php8/conf.d/salt.ini
|
||||||
pools: /etc/php-fpm.d
|
pools: /etc/php8/fpm/php-fpm.d
|
||||||
service: php-fpm
|
service: php-fpm
|
||||||
user: root
|
user: root
|
||||||
pkgs:
|
pkgs:
|
||||||
adodb: php5-dba
|
adodb: php8-dba
|
||||||
apache2: apache2-mod_php5
|
apache2: apache2-mod_php8
|
||||||
cli: php5
|
cli: php8
|
||||||
curl: php5-curl
|
curl: php8-curl
|
||||||
fpm: php5-fpm
|
fpm: php8-fpm
|
||||||
gd: php5-gd
|
gd: php8-gd
|
||||||
imap: php5-imap
|
imap: php8-imap
|
||||||
intl: php5-intl
|
intl: php8-intl
|
||||||
json: php5-json
|
json: php8-json
|
||||||
ldap: php5-ldap
|
ldap: php8-ldap
|
||||||
mbstring: php5-mbstring
|
mbstring: php8-mbstring
|
||||||
mcrypt: php5-mcrypt
|
mcrypt: php8-mcrypt
|
||||||
mysql: php5-mysql
|
mysql: php8-mysql
|
||||||
oauth: php5-oauth
|
oauth: php8-oauth
|
||||||
pear: php5-pear
|
pear: php8-pear
|
||||||
pgsql: php5-pgsql
|
pgsql: php8-pgsql
|
||||||
php: php7
|
php: php8
|
||||||
snmp: php5-snmp
|
snmp: php8-snmp
|
||||||
soap: php5-soap
|
soap: php8-soap
|
||||||
sqlite: php5-sqlite
|
sqlite: php8-sqlite
|
||||||
suhosin: php5-suhosin
|
suhosin: php8-suhosin
|
||||||
xml:
|
xml:
|
||||||
- php5-xmlreader
|
- php8-xmlreader
|
||||||
- php5-xmlwriter
|
- php8-xmlwriter
|
||||||
- php5-xmlrpc
|
- php8-xmlrpc
|
||||||
zip: php5-zip
|
zip: php8-zip
|
||||||
xcache:
|
xcache:
|
||||||
ini:
|
ini:
|
||||||
defaults:
|
defaults:
|
||||||
|
|||||||
@ -4,4 +4,4 @@
|
|||||||
php:
|
php:
|
||||||
lookup:
|
lookup:
|
||||||
pkgs:
|
pkgs:
|
||||||
php: php7
|
php: php8
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user