saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(module): include php version in redis module package name

Browse Source 
set the php version in the map for debian and ubuntu of module redis to allow installation of the desired version
This commit is contained in:
ahummeling 2021-09-14 20:39:26 +02:00
commit 2f62f6fa4e
8 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
php/map.jinja
View File

@ -79,7 +79,7 @@
'phpenmod_command': 'phpenmod -v' + php_version,
'pspell': 'php' + php_version + '-pspell',
'readline': 'php' + php_version + '-readline',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php' + php_version + '-snmp',
'soap': 'php' + php_version + '-soap',
@ -772,7 +772,7 @@
'php': 'php',
'phpenmod_command': 'phpenmod',
'pspell': 'php-pspell',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php-snmp',
'soap': 'php-soap',
@ -1165,7 +1165,7 @@
'php': 'php',
'phpenmod_command': 'phpenmod',
'pspell': 'php-pspell',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php-snmp',
'soap': 'php-soap',
@ -1558,7 +1558,7 @@
'php': 'php',
'phpenmod_command': 'phpenmod',
'pspell': 'php-pspell',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php-snmp',
'soap': 'php-soap',
@ -2387,7 +2387,7 @@
'phpenmod_command': 'phpenmod -v' + php_version,
'pspell': 'php' + php_version + '-pspell',
'readline': 'php' + php_version + '-readline',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php' + php_version + '-snmp',
'soap': 'php' + php_version + '-soap',

6
test/integration/default/controls/package_spec.rb
View File

@ -9,17 +9,13 @@ control 'Php package' do
it { should be_installed }
end
describe package('php-redis') do
it { should be_installed }
end
describe package('php-xdebug') do
it { should be_installed }
end
%w[
bz2 cli curl fpm gd imap intl mbstring
mysql readline xml zip
mysql readline redis xml zip
].each do |pkg|
describe package("php5.6-#{pkg}") do
it { should be_installed }

2
test/integration/default/files/_mapdata/debian-10.yaml
View File

@ -344,7 +344,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

2
test/integration/default/files/_mapdata/debian-11.yaml
View File

@ -344,7 +344,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

2
test/integration/default/files/_mapdata/debian-9.yaml
View File

@ -344,7 +344,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

2
test/integration/default/files/_mapdata/ubuntu-16.yaml
View File

@ -342,7 +342,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

2
test/integration/default/files/_mapdata/ubuntu-18.yaml
View File

@ -342,7 +342,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib

2
test/integration/default/files/_mapdata/ubuntu-20.yaml
View File

@ -342,7 +342,7 @@ values:
phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell
readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib:
- php-phpseclib
- php-seclib