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

Merge pull request #229 from Ahummeling/fix-redis-debian

Browse Source 
add php version to redis for debian in map.jinja
This commit is contained in:
Imran Iqbal 2021-09-17 14:52:03 +01:00 committed by GitHub
commit 2699663eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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, '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',
@ -772,7 +772,7 @@
'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',
@ -1165,7 +1165,7 @@
'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',
@ -1558,7 +1558,7 @@
'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',
@ -2387,7 +2387,7 @@
'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',

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

@ -9,17 +9,13 @@ control 'Php package' do
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 }

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

@ -344,7 +344,7 @@ values:
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

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

@ -344,7 +344,7 @@ values:
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

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

@ -344,7 +344,7 @@ values:
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

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

@ -342,7 +342,7 @@ values:
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

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

@ -342,7 +342,7 @@ values:
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

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

@ -342,7 +342,7 @@ values:
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