Skip to content

Commit baec950

Browse files
authored
Merge pull request #530 from lelutin/default_version_debian_buster
set default version for debian buster and add support for buster
2 parents 1726187 + 8b9d5a4 commit baec950

7 files changed

Lines changed: 23 additions & 3 deletions

File tree

manifests/globals.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828

2929
$default_php_version = $facts['os']['name'] ? {
3030
'Debian' => $facts['os']['release']['major'] ? {
31-
'9' => '7.0',
31+
'9' => '7.0',
32+
'10' => '7.3',
3233
default => '5.x',
3334
},
3435
'Ubuntu' => $facts['os']['release']['major'] ? {

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
case $facts['os']['name'] {
4646
'Debian': {
47-
$manage_repos = (versioncmp($facts['os']['release']['major'], '8') < 0)
47+
$manage_repos = false
4848
}
4949

5050
'Ubuntu': {

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"operatingsystem": "Debian",
4949
"operatingsystemrelease": [
5050
"8",
51-
"9"
51+
"9",
52+
"10"
5253
]
5354
},
5455
{

spec/acceptance/php_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
packagename = 'php5-fpm'
2323
when %r{debian-9}
2424
packagename = 'php7.0-fpm'
25+
when %r{debian-10}
26+
packagename = 'php7.3-fpm'
2527
end
2628
describe package(packagename) do
2729
it { is_expected.to be_installed }
@@ -112,6 +114,8 @@
112114
packagename = 'php5-fpm'
113115
when %r{debian-9}
114116
packagename = 'php7.0-fpm'
117+
when %r{debian-10}
118+
packagename = 'php7.3-fpm'
115119
end
116120
describe package(packagename) do
117121
it { is_expected.to be_installed }

spec/classes/php_spec.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
php_cli_package = case facts[:os]['name']
1111
when 'Debian'
1212
case facts[:os]['release']['major']
13+
when '10'
14+
'php7.3-cli'
1315
when '9'
1416
'php7.0-cli'
1517
else
@@ -28,6 +30,8 @@
2830
php_fpm_package = case facts[:os]['name']
2931
when 'Debian'
3032
case facts[:os]['release']['major']
33+
when '10'
34+
'php7.3-fpm'
3135
when '9'
3236
'php7.0-fpm'
3337
else
@@ -46,6 +50,8 @@
4650
php_dev_package = case facts[:os]['name']
4751
when 'Debian'
4852
case facts[:os]['release']['major']
53+
when '10'
54+
'php7.3-dev'
4955
when '9'
5056
'php7.0-dev'
5157
else
@@ -161,6 +167,8 @@
161167
case facts[:os]['name']
162168
when 'Debian'
163169
case facts[:os]['release']['major']
170+
when '10'
171+
'/etc/php/7.3/fpm/pool.d/www.conf'
164172
when '9'
165173
'/etc/php/7.0/fpm/pool.d/www.conf'
166174
else
@@ -199,6 +207,8 @@
199207
case facts[:os]['name']
200208
when 'Debian'
201209
case facts[:os]['release']['major']
210+
when '10'
211+
'/etc/php/7.3/fpm/pool.d/www.conf'
202212
when '9'
203213
'/etc/php/7.0/fpm/pool.d/www.conf'
204214
else

spec/defines/extension_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
etcdir = case facts[:os]['name']
1313
when 'Debian'
1414
case facts[:os]['release']['major']
15+
when '10'
16+
'/etc/php/7.3/mods-available'
1517
when '9'
1618
'/etc/php/7.0/mods-available'
1719
else

spec/defines/fpm_pool_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
let(:params) { {} }
1616

1717
case facts[:os]['release']['major']
18+
when '10'
19+
it { is_expected.to contain_file('/etc/php/7.3/fpm/pool.d/unique-name.conf') }
1820
when '9'
1921
it { is_expected.to contain_file('/etc/php/7.0/fpm/pool.d/unique-name.conf') }
2022
else

0 commit comments

Comments
 (0)