Skip to content

Commit 55d1545

Browse files
tacerustacerus
committed
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>
1 parent 9c69a4e commit 55d1545

6 files changed

Lines changed: 91 additions & 101 deletions

File tree

‎docs/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Installs the php-cache-lite package.
140140
^^^^^^^^^^^^^^
141141

142142
Installs the php-cgi package.
143-
Disabled on opensuse only php5-fastcgi available.
143+
Disabled on openSUSE, as there is only php-fastcgi available.
144144

145145
``php.cli``
146146
^^^^^^^^^^^^^^

‎php/map.jinja‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3000,47 +3000,43 @@
30003000
},
30013001
'Suse': {
30023002
'pkgs': {
3003-
'adodb': 'php5-dba',
3004-
'apache2': 'apache2-mod_php5',
3005-
'cli': 'php5',
3006-
'curl': 'php5-curl',
3007-
'fpm': 'php5-fpm',
3008-
'gd': 'php5-gd',
3009-
'imap': 'php5-imap',
3010-
'intl': 'php5-intl',
3011-
'json': 'php5-json',
3012-
'ldap': 'php5-ldap',
3013-
'mbstring': 'php5-mbstring',
3014-
'mcrypt': 'php5-mcrypt',
3015-
'mysql': 'php5-mysql',
3016-
'oauth': 'php5-oauth',
3017-
'pear': 'php5-pear',
3018-
'pgsql': 'php5-pgsql',
3019-
'php': 'php5',
3020-
'snmp': 'php5-snmp',
3021-
'soap': 'php5-soap',
3022-
'sqlite': 'php5-sqlite',
3023-
'suhosin': 'php5-suhosin',
3024-
'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'],
3025-
'zip': 'php5-zip',
3003+
'adodb': 'php8-dba',
3004+
'apache2': 'apache2-mod_php8',
3005+
'cli': 'php8',
3006+
'curl': 'php8-curl',
3007+
'fpm': 'php8-fpm',
3008+
'gd': 'php8-gd',
3009+
'imap': 'php8-imap',
3010+
'intl': 'php8-intl',
3011+
'json': 'php8-json',
3012+
'ldap': 'php8-ldap',
3013+
'mbstring': 'php8-mbstring',
3014+
'mcrypt': 'php8-mcrypt',
3015+
'mysql': 'php8-mysql',
3016+
'oauth': 'php8-oauth',
3017+
'pear': 'php8-pear',
3018+
'pgsql': 'php8-pgsql',
3019+
'php': 'php8',
3020+
'snmp': 'php8-snmp',
3021+
'soap': 'php8-soap',
3022+
'sqlite': 'php8-sqlite',
3023+
'suhosin': 'php8-suhosin',
3024+
'xml': ['php8-xmlreader','php8-xmlwriter','php8-xmlrpc'],
3025+
'zip': 'php8-zip',
30263026
},
30273027
'fpm': {
3028-
'conf': '/etc/php-fpm.conf',
3029-
'ini': '/etc/php.ini',
3030-
'pools': '/etc/php-fpm.d',
3028+
'conf': '/etc/php8/fpm/php-fpm.conf',
3029+
'ini': '/etc/php8/conf.d/salt.ini',
3030+
'pools': '/etc/php8/fpm/php-fpm.d',
30313031
'service': 'php-fpm',
30323032
'user': 'root',
30333033
'group': 'root',
30343034
'defaults': {
3035-
'global': {
3036-
'pid': '/var/run/php-fpm/php-fpm.pid',
3037-
'error_log': '/var/log/php-fpm/error.log',
3038-
},
3039-
'include': '/etc/php-fpm.d/*.conf',
3035+
'include': '/etc/php8/fpm/php-fpm.d/*.conf',
30403036
},
30413037
},
30423038
'cli': {
3043-
'ini': '/etc/php.ini',
3039+
'ini': '/etc/php8/cli/php.ini',
30443040
},
30453041
},
30463042
'Arch': {

‎test/integration/default/controls/package_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_redhat
3535
end
3636

3737
def test_suse
38-
describe package('php7') do
38+
describe package('php8') do
3939
it { should be_installed }
4040
end
4141
end

‎test/integration/default/files/_mapdata/opensuse-15.yaml‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -199,46 +199,43 @@ values:
199199
soap.wsdl_cache_ttl: 86400
200200
lookup:
201201
cli:
202-
ini: /etc/php.ini
202+
ini: /etc/php8/cli/php.ini
203203
fpm:
204-
conf: /etc/php-fpm.conf
204+
conf: /etc/php8/fpm/php-fpm.conf
205205
defaults:
206-
global:
207-
error_log: /var/log/php-fpm/error.log
208-
pid: /var/run/php-fpm/php-fpm.pid
209-
include: /etc/php-fpm.d/*.conf
206+
include: /etc/php8/fpm/php-fpm.d/*.conf
210207
group: root
211-
ini: /etc/php.ini
212-
pools: /etc/php-fpm.d
208+
ini: /etc/php8/conf.d/salt.ini
209+
pools: /etc/php8/fpm/php-fpm.d
213210
service: php-fpm
214211
user: root
215212
pkgs:
216-
adodb: php5-dba
217-
apache2: apache2-mod_php5
218-
cli: php5
219-
curl: php5-curl
220-
fpm: php5-fpm
221-
gd: php5-gd
222-
imap: php5-imap
223-
intl: php5-intl
224-
json: php5-json
225-
ldap: php5-ldap
226-
mbstring: php5-mbstring
227-
mcrypt: php5-mcrypt
228-
mysql: php5-mysql
229-
oauth: php5-oauth
230-
pear: php5-pear
231-
pgsql: php5-pgsql
232-
php: php7
233-
snmp: php5-snmp
234-
soap: php5-soap
235-
sqlite: php5-sqlite
236-
suhosin: php5-suhosin
213+
adodb: php8-dba
214+
apache2: apache2-mod_php8
215+
cli: php8
216+
curl: php8-curl
217+
fpm: php8-fpm
218+
gd: php8-gd
219+
imap: php8-imap
220+
intl: php8-intl
221+
json: php8-json
222+
ldap: php8-ldap
223+
mbstring: php8-mbstring
224+
mcrypt: php8-mcrypt
225+
mysql: php8-mysql
226+
oauth: php8-oauth
227+
pear: php8-pear
228+
pgsql: php8-pgsql
229+
php: php8
230+
snmp: php8-snmp
231+
soap: php8-soap
232+
sqlite: php8-sqlite
233+
suhosin: php8-suhosin
237234
xml:
238-
- php5-xmlreader
239-
- php5-xmlwriter
240-
- php5-xmlrpc
241-
zip: php5-zip
235+
- php8-xmlreader
236+
- php8-xmlwriter
237+
- php8-xmlrpc
238+
zip: php8-zip
242239
xcache:
243240
ini:
244241
defaults:

‎test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -199,46 +199,43 @@ values:
199199
soap.wsdl_cache_ttl: 86400
200200
lookup:
201201
cli:
202-
ini: /etc/php.ini
202+
ini: /etc/php8/cli/php.ini
203203
fpm:
204-
conf: /etc/php-fpm.conf
204+
conf: /etc/php8/fpm/php-fpm.conf
205205
defaults:
206-
global:
207-
error_log: /var/log/php-fpm/error.log
208-
pid: /var/run/php-fpm/php-fpm.pid
209-
include: /etc/php-fpm.d/*.conf
206+
include: /etc/php8/fpm/php-fpm.d/*.conf
210207
group: root
211-
ini: /etc/php.ini
212-
pools: /etc/php-fpm.d
208+
ini: /etc/php8/conf.d/salt.ini
209+
pools: /etc/php8/fpm/php-fpm.d
213210
service: php-fpm
214211
user: root
215212
pkgs:
216-
adodb: php5-dba
217-
apache2: apache2-mod_php5
218-
cli: php5
219-
curl: php5-curl
220-
fpm: php5-fpm
221-
gd: php5-gd
222-
imap: php5-imap
223-
intl: php5-intl
224-
json: php5-json
225-
ldap: php5-ldap
226-
mbstring: php5-mbstring
227-
mcrypt: php5-mcrypt
228-
mysql: php5-mysql
229-
oauth: php5-oauth
230-
pear: php5-pear
231-
pgsql: php5-pgsql
232-
php: php7
233-
snmp: php5-snmp
234-
soap: php5-soap
235-
sqlite: php5-sqlite
236-
suhosin: php5-suhosin
213+
adodb: php8-dba
214+
apache2: apache2-mod_php8
215+
cli: php8
216+
curl: php8-curl
217+
fpm: php8-fpm
218+
gd: php8-gd
219+
imap: php8-imap
220+
intl: php8-intl
221+
json: php8-json
222+
ldap: php8-ldap
223+
mbstring: php8-mbstring
224+
mcrypt: php8-mcrypt
225+
mysql: php8-mysql
226+
oauth: php8-oauth
227+
pear: php8-pear
228+
pgsql: php8-pgsql
229+
php: php8
230+
snmp: php8-snmp
231+
soap: php8-soap
232+
sqlite: php8-sqlite
233+
suhosin: php8-suhosin
237234
xml:
238-
- php5-xmlreader
239-
- php5-xmlwriter
240-
- php5-xmlrpc
241-
zip: php5-zip
235+
- php8-xmlreader
236+
- php8-xmlwriter
237+
- php8-xmlrpc
238+
zip: php8-zip
242239
xcache:
243240
ini:
244241
defaults:

‎test/salt/pillar/suse.sls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
php:
55
lookup:
66
pkgs:
7-
php: php7
7+
php: php8

0 commit comments

Comments
 (0)