Skip to content

Commit

Permalink
fix(suse): update to php8
Browse files Browse the repository at this point in the history 
Modern openSUSE distributions no longer ship PHP 5 - set defaults to PHP
8 instead.

Signed-off-by: Georg Pfuetzenreuter <[email protected]>
  • Loading branch information
@tacerus
tacerus committed Feb 25, 2023
1 parent 9c69a4e commit 55d1545
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 101 deletions.
2 changes: 1 addition & 1 deletion docs/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Installs the php-cache-lite 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``
^^^^^^^^^^^^^^
Expand Down
60 changes: 28 additions & 32 deletions php/map.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3000,47 +3000,43 @@
},
'Suse': {
'pkgs': {
'adodb': 'php5-dba',
'apache2': 'apache2-mod_php5',
'cli': 'php5',
'curl': 'php5-curl',
'fpm': 'php5-fpm',
'gd': 'php5-gd',
'imap': 'php5-imap',
'intl': 'php5-intl',
'json': 'php5-json',
'ldap': 'php5-ldap',
'mbstring': 'php5-mbstring',
'mcrypt': 'php5-mcrypt',
'mysql': 'php5-mysql',
'oauth': 'php5-oauth',
'pear': 'php5-pear',
'pgsql': 'php5-pgsql',
'php': 'php5',
'snmp': 'php5-snmp',
'soap': 'php5-soap',
'sqlite': 'php5-sqlite',
'suhosin': 'php5-suhosin',
'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'],
'zip': 'php5-zip',
'adodb': 'php8-dba',
'apache2': 'apache2-mod_php8',
'cli': 'php8',
'curl': 'php8-curl',
'fpm': 'php8-fpm',
'gd': 'php8-gd',
'imap': 'php8-imap',
'intl': 'php8-intl',
'json': 'php8-json',
'ldap': 'php8-ldap',
'mbstring': 'php8-mbstring',
'mcrypt': 'php8-mcrypt',
'mysql': 'php8-mysql',
'oauth': 'php8-oauth',
'pear': 'php8-pear',
'pgsql': 'php8-pgsql',
'php': 'php8',
'snmp': 'php8-snmp',
'soap': 'php8-soap',
'sqlite': 'php8-sqlite',
'suhosin': 'php8-suhosin',
'xml': ['php8-xmlreader','php8-xmlwriter','php8-xmlrpc'],
'zip': 'php8-zip',
},
'fpm': {
'conf': '/etc/php-fpm.conf',
'ini': '/etc/php.ini',
'pools': '/etc/php-fpm.d',
'conf': '/etc/php8/fpm/php-fpm.conf',
'ini': '/etc/php8/conf.d/salt.ini',
'pools': '/etc/php8/fpm/php-fpm.d',
'service': 'php-fpm',
'user': 'root',
'group': 'root',
'defaults': {
'global': {
'pid': '/var/run/php-fpm/php-fpm.pid',
'error_log': '/var/log/php-fpm/error.log',
},
'include': '/etc/php-fpm.d/*.conf',
'include': '/etc/php8/fpm/php-fpm.d/*.conf',
},
},
'cli': {
'ini': '/etc/php.ini',
'ini': '/etc/php8/cli/php.ini',
},
},
'Arch': {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/default/controls/package_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_redhat
end

def test_suse
describe package('php7') do
describe package('php8') do
it { should be_installed }
end
end
Expand Down
63 changes: 30 additions & 33 deletions test/integration/default/files/_mapdata/opensuse-15.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,46 +199,43 @@ values:
soap.wsdl_cache_ttl: 86400
lookup:
cli:
ini: /etc/php.ini
ini: /etc/php8/cli/php.ini
fpm:
conf: /etc/php-fpm.conf
conf: /etc/php8/fpm/php-fpm.conf
defaults:
global:
error_log: /var/log/php-fpm/error.log
pid: /var/run/php-fpm/php-fpm.pid
include: /etc/php-fpm.d/*.conf
include: /etc/php8/fpm/php-fpm.d/*.conf
group: root
ini: /etc/php.ini
pools: /etc/php-fpm.d
ini: /etc/php8/conf.d/salt.ini
pools: /etc/php8/fpm/php-fpm.d
service: php-fpm
user: root
pkgs:
adodb: php5-dba
apache2: apache2-mod_php5
cli: php5
curl: php5-curl
fpm: php5-fpm
gd: php5-gd
imap: php5-imap
intl: php5-intl
json: php5-json
ldap: php5-ldap
mbstring: php5-mbstring
mcrypt: php5-mcrypt
mysql: php5-mysql
oauth: php5-oauth
pear: php5-pear
pgsql: php5-pgsql
php: php7
snmp: php5-snmp
soap: php5-soap
sqlite: php5-sqlite
suhosin: php5-suhosin
adodb: php8-dba
apache2: apache2-mod_php8
cli: php8
curl: php8-curl
fpm: php8-fpm
gd: php8-gd
imap: php8-imap
intl: php8-intl
json: php8-json
ldap: php8-ldap
mbstring: php8-mbstring
mcrypt: php8-mcrypt
mysql: php8-mysql
oauth: php8-oauth
pear: php8-pear
pgsql: php8-pgsql
php: php8
snmp: php8-snmp
soap: php8-soap
sqlite: php8-sqlite
suhosin: php8-suhosin
xml:
- php5-xmlreader
- php5-xmlwriter
- php5-xmlrpc
zip: php5-zip
- php8-xmlreader
- php8-xmlwriter
- php8-xmlrpc
zip: php8-zip
xcache:
ini:
defaults:
Expand Down
63 changes: 30 additions & 33 deletions test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,46 +199,43 @@ values:
soap.wsdl_cache_ttl: 86400
lookup:
cli:
ini: /etc/php.ini
ini: /etc/php8/cli/php.ini
fpm:
conf: /etc/php-fpm.conf
conf: /etc/php8/fpm/php-fpm.conf
defaults:
global:
error_log: /var/log/php-fpm/error.log
pid: /var/run/php-fpm/php-fpm.pid
include: /etc/php-fpm.d/*.conf
include: /etc/php8/fpm/php-fpm.d/*.conf
group: root
ini: /etc/php.ini
pools: /etc/php-fpm.d
ini: /etc/php8/conf.d/salt.ini
pools: /etc/php8/fpm/php-fpm.d
service: php-fpm
user: root
pkgs:
adodb: php5-dba
apache2: apache2-mod_php5
cli: php5
curl: php5-curl
fpm: php5-fpm
gd: php5-gd
imap: php5-imap
intl: php5-intl
json: php5-json
ldap: php5-ldap
mbstring: php5-mbstring
mcrypt: php5-mcrypt
mysql: php5-mysql
oauth: php5-oauth
pear: php5-pear
pgsql: php5-pgsql
php: php7
snmp: php5-snmp
soap: php5-soap
sqlite: php5-sqlite
suhosin: php5-suhosin
adodb: php8-dba
apache2: apache2-mod_php8
cli: php8
curl: php8-curl
fpm: php8-fpm
gd: php8-gd
imap: php8-imap
intl: php8-intl
json: php8-json
ldap: php8-ldap
mbstring: php8-mbstring
mcrypt: php8-mcrypt
mysql: php8-mysql
oauth: php8-oauth
pear: php8-pear
pgsql: php8-pgsql
php: php8
snmp: php8-snmp
soap: php8-soap
sqlite: php8-sqlite
suhosin: php8-suhosin
xml:
- php5-xmlreader
- php5-xmlwriter
- php5-xmlrpc
zip: php5-zip
- php8-xmlreader
- php8-xmlwriter
- php8-xmlrpc
zip: php8-zip
xcache:
ini:
defaults:
Expand Down
2 changes: 1 addition & 1 deletion test/salt/pillar/suse.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
php:
lookup:
pkgs:
php: php7
php: php8

0 comments on commit 55d1545

Please sign in to comment.