Browse Source

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

set the php version in the map for debian and ubuntu of module redis to allow installation of the desired version
tags/v1.5.1
ahummeling 3 years ago
parent
commit
2f62f6fa4e
8 changed files with 12 additions and 16 deletions
  1. +5
    -5
      php/map.jinja
  2. +1
    -5
      test/integration/default/controls/package_spec.rb
  3. +1
    -1
      test/integration/default/files/_mapdata/debian-10.yaml
  4. +1
    -1
      test/integration/default/files/_mapdata/debian-11.yaml
  5. +1
    -1
      test/integration/default/files/_mapdata/debian-9.yaml
  6. +1
    -1
      test/integration/default/files/_mapdata/ubuntu-16.yaml
  7. +1
    -1
      test/integration/default/files/_mapdata/ubuntu-18.yaml
  8. +1
    -1
      test/integration/default/files/_mapdata/ubuntu-20.yaml

+ 5
- 5
php/map.jinja View File

'phpenmod_command': 'phpenmod -v' + php_version, 'phpenmod_command': 'phpenmod -v' + php_version,
'pspell': 'php' + php_version + '-pspell', 'pspell': 'php' + php_version + '-pspell',
'readline': 'php' + php_version + '-readline', 'readline': 'php' + php_version + '-readline',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'], 'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php' + php_version + '-snmp', 'snmp': 'php' + php_version + '-snmp',
'soap': 'php' + php_version + '-soap', 'soap': 'php' + php_version + '-soap',
'php': 'php', 'php': 'php',
'phpenmod_command': 'phpenmod', 'phpenmod_command': 'phpenmod',
'pspell': 'php-pspell', 'pspell': 'php-pspell',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'], 'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php-snmp', 'snmp': 'php-snmp',
'soap': 'php-soap', 'soap': 'php-soap',
'php': 'php', 'php': 'php',
'phpenmod_command': 'phpenmod', 'phpenmod_command': 'phpenmod',
'pspell': 'php-pspell', 'pspell': 'php-pspell',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'], 'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php-snmp', 'snmp': 'php-snmp',
'soap': 'php-soap', 'soap': 'php-soap',
'php': 'php', 'php': 'php',
'phpenmod_command': 'phpenmod', 'phpenmod_command': 'phpenmod',
'pspell': 'php-pspell', 'pspell': 'php-pspell',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'], 'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php-snmp', 'snmp': 'php-snmp',
'soap': 'php-soap', 'soap': 'php-soap',
'phpenmod_command': 'phpenmod -v' + php_version, 'phpenmod_command': 'phpenmod -v' + php_version,
'pspell': 'php' + php_version + '-pspell', 'pspell': 'php' + php_version + '-pspell',
'readline': 'php' + php_version + '-readline', 'readline': 'php' + php_version + '-readline',
'redis': 'php-redis',
'redis': 'php' + php_version + '-redis',
'seclib': ['php-phpseclib', 'php-seclib'], 'seclib': ['php-phpseclib', 'php-seclib'],
'snmp': 'php' + php_version + '-snmp', 'snmp': 'php' + php_version + '-snmp',
'soap': 'php' + php_version + '-soap', 'soap': 'php' + php_version + '-soap',

+ 1
- 5
test/integration/default/controls/package_spec.rb View File

it { should be_installed } it { should be_installed }
end end


describe package('php-redis') do
it { should be_installed }
end

describe package('php-xdebug') do describe package('php-xdebug') do
it { should be_installed } it { should be_installed }
end end


%w[ %w[
bz2 cli curl fpm gd imap intl mbstring bz2 cli curl fpm gd imap intl mbstring
mysql readline xml zip
mysql readline redis xml zip
].each do |pkg| ].each do |pkg|
describe package("php5.6-#{pkg}") do describe package("php5.6-#{pkg}") do
it { should be_installed } it { should be_installed }

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

phpenmod_command: phpenmod -v5.6 phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell pspell: php5.6-pspell
readline: php5.6-readline readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib: seclib:
- php-phpseclib - php-phpseclib
- php-seclib - php-seclib

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

phpenmod_command: phpenmod -v5.6 phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell pspell: php5.6-pspell
readline: php5.6-readline readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib: seclib:
- php-phpseclib - php-phpseclib
- php-seclib - php-seclib

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

phpenmod_command: phpenmod -v5.6 phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell pspell: php5.6-pspell
readline: php5.6-readline readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib: seclib:
- php-phpseclib - php-phpseclib
- php-seclib - php-seclib

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

phpenmod_command: phpenmod -v5.6 phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell pspell: php5.6-pspell
readline: php5.6-readline readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib: seclib:
- php-phpseclib - php-phpseclib
- php-seclib - php-seclib

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

phpenmod_command: phpenmod -v5.6 phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell pspell: php5.6-pspell
readline: php5.6-readline readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib: seclib:
- php-phpseclib - php-phpseclib
- php-seclib - php-seclib

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

phpenmod_command: phpenmod -v5.6 phpenmod_command: phpenmod -v5.6
pspell: php5.6-pspell pspell: php5.6-pspell
readline: php5.6-readline readline: php5.6-readline
redis: php-redis
redis: php5.6-redis
seclib: seclib:
- php-phpseclib - php-phpseclib
- php-seclib - php-seclib

Loading…
Cancel
Save