Skip to content

Commit 42420b9

Browse files
kenyonkenyon
authored
Merge pull request #756 from kenyon/drop-eol-os
Drop support for EOL Ubuntu 20.04, Debian 10, EL 7, FreeBSD 11, SLES 11
2 parents d75491d + 14cbf0b commit 42420b9

File tree

3 files changed

+54
-153
lines changed

3 files changed

+54
-153
lines changed

‎manifests/globals.pp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,12 @@
3333
if ($php_version == undef) {
3434
$globals_php_version = $facts['os']['name'] ? {
3535
'Debian' => $facts['os']['release']['major'] ? {
36-
'10' => '7.3',
3736
'11' => '7.4',
3837
'12' => '8.2',
3938
'13' => '8.4',
4039
default => fail("Unsupported Debian release: ${fact('os.release.major')}"),
4140
},
4241
'Ubuntu' => $facts['os']['release']['major'] ? {
43-
'18.04' => '7.2',
44-
'20.04' => '7.4',
4542
'22.04' => '8.1',
4643
'24.04' => '8.3',
4744
default => fail("Unsupported Ubuntu release: ${fact('os.release.major')}"),

‎metadata.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,13 @@
4848
{
4949
"operatingsystem": "Ubuntu",
5050
"operatingsystemrelease": [
51-
"20.04",
5251
"22.04",
5352
"24.04"
5453
]
5554
},
5655
{
5756
"operatingsystem": "Debian",
5857
"operatingsystemrelease": [
59-
"10",
6058
"11",
6159
"12",
6260
"13"
@@ -65,7 +63,6 @@
6563
{
6664
"operatingsystem": "RedHat",
6765
"operatingsystemrelease": [
68-
"7",
6966
"8",
7067
"9",
7168
"10"
@@ -74,7 +71,6 @@
7471
{
7572
"operatingsystem": "CentOS",
7673
"operatingsystemrelease": [
77-
"7",
7874
"9",
7975
"10"
8076
]
@@ -98,14 +94,12 @@
9894
{
9995
"operatingsystem": "FreeBSD",
10096
"operatingsystemrelease": [
101-
"11",
10297
"13"
10398
]
10499
},
105100
{
106101
"operatingsystem": "SLES",
107102
"operatingsystemrelease": [
108-
"11",
109103
"15"
110104
]
111105
},

‎spec/classes/php_spec.rb‎

Lines changed: 54 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -11,87 +11,42 @@
1111

1212
php_cli_package = case facts[:os]['name']
1313
when 'Debian'
14-
case facts[:os]['release']['major']
15-
when '13'
16-
'php8.4-cli'
17-
when '12'
18-
'php8.2-cli'
19-
when '11'
20-
'php7.4-cli'
21-
when '10'
22-
'php7.3-cli'
23-
else
24-
'php5-cli'
25-
end
14+
{
15+
'13' => 'php8.4-cli',
16+
'12' => 'php8.2-cli',
17+
'11' => 'php7.4-cli',
18+
}[facts[:os]['release']['major']]
2619
when 'Ubuntu'
27-
case facts[:os]['release']['major']
28-
when '24.04'
29-
'php8.3-cli'
30-
when '22.04'
31-
'php8.1-cli'
32-
when '20.04'
33-
'php7.4-cli'
34-
when '18.04'
35-
'php7.2-cli'
36-
else
37-
'php5-cli'
38-
end
20+
{
21+
'24.04' => 'php8.3-cli',
22+
'22.04' => 'php8.1-cli',
23+
}[facts[:os]['release']['major']]
3924
end
4025
php_fpm_package = case facts[:os]['name']
4126
when 'Debian'
42-
case facts[:os]['release']['major']
43-
when '13'
44-
'php8.4-fpm'
45-
when '12'
46-
'php8.2-fpm'
47-
when '11'
48-
'php7.4-fpm'
49-
when '10'
50-
'php7.3-fpm'
51-
else
52-
'php5-fpm'
53-
end
27+
{
28+
'13' => 'php8.4-fpm',
29+
'12' => 'php8.2-fpm',
30+
'11' => 'php7.4-fpm',
31+
}[facts[:os]['release']['major']]
5432
when 'Ubuntu'
55-
case facts[:os]['release']['major']
56-
when '24.04'
57-
'php8.3-fpm'
58-
when '22.04'
59-
'php8.1-fpm'
60-
when '20.04'
61-
'php7.4-fpm'
62-
when '18.04'
63-
'php7.2-fpm'
64-
else
65-
'php5-fpm'
66-
end
33+
{
34+
'24.04' => 'php8.3-fpm',
35+
'22.04' => 'php8.1-fpm',
36+
}[facts[:os]['release']['major']]
6737
end
6838
php_dev_package = case facts[:os]['name']
6939
when 'Debian'
70-
case facts[:os]['release']['major']
71-
when '13'
72-
'php8.4-dev'
73-
when '12'
74-
'php8.2-dev'
75-
when '11'
76-
'php7.4-dev'
77-
when '10'
78-
'php7.3-dev'
79-
else
80-
'php5-dev'
81-
end
40+
{
41+
'13' => 'php8.4-dev',
42+
'12' => 'php8.2-dev',
43+
'11' => 'php7.4-dev',
44+
}[facts[:os]['release']['major']]
8245
when 'Ubuntu'
83-
case facts[:os]['release']['major']
84-
when '24.04'
85-
'php8.3-dev'
86-
when '22.04'
87-
'php8.1-dev'
88-
when '20.04'
89-
'php7.4-dev'
90-
when '18.04'
91-
'php7.2-dev'
92-
else
93-
'php5-dev'
94-
end
46+
{
47+
'24.04' => 'php8.3-dev',
48+
'22.04' => 'php8.1-dev',
49+
}[facts[:os]['release']['major']]
9550
end
9651
describe 'works without params' do
9752
it { is_expected.to compile.with_all_deps }
@@ -195,31 +150,16 @@
195150
when 'Debian'
196151
case facts[:os]['name']
197152
when 'Debian'
198-
case facts[:os]['release']['major']
199-
when '13'
200-
'/etc/php/8.4/fpm/pool.d/www.conf'
201-
when '12'
202-
'/etc/php/8.2/fpm/pool.d/www.conf'
203-
when '11'
204-
'/etc/php/7.4/fpm/pool.d/www.conf'
205-
when '10'
206-
'/etc/php/7.3/fpm/pool.d/www.conf'
207-
else
208-
'/etc/php5/fpm/pool.d/www.conf'
209-
end
153+
{
154+
'13' => '/etc/php/8.4/fpm/pool.d/www.conf',
155+
'12' => '/etc/php/8.2/fpm/pool.d/www.conf',
156+
'11' => '/etc/php/7.4/fpm/pool.d/www.conf',
157+
}[facts[:os]['release']['major']]
210158
when 'Ubuntu'
211-
case facts[:os]['release']['major']
212-
when '24.04'
213-
'/etc/php/8.3/fpm/pool.d/www.conf'
214-
when '22.04'
215-
'/etc/php/8.1/fpm/pool.d/www.conf'
216-
when '20.04'
217-
'/etc/php/7.4/fpm/pool.d/www.conf'
218-
when '18.04'
219-
'/etc/php/7.2/fpm/pool.d/www.conf'
220-
else
221-
'/etc/php5/fpm/pool.d/www.conf'
222-
end
159+
{
160+
'24.04' => '/etc/php/8.3/fpm/pool.d/www.conf',
161+
'22.04' => '/etc/php/8.1/fpm/pool.d/www.conf',
162+
}[facts[:os]['release']['major']]
223163
end
224164
when 'Archlinux'
225165
'/etc/php/php-fpm.d/www.conf'
@@ -244,31 +184,16 @@
244184
when 'Debian'
245185
case facts[:os]['name']
246186
when 'Debian'
247-
case facts[:os]['release']['major']
248-
when '13'
249-
'/etc/php/8.4/fpm/pool.d/www.conf'
250-
when '12'
251-
'/etc/php/8.2/fpm/pool.d/www.conf'
252-
when '11'
253-
'/etc/php/7.4/fpm/pool.d/www.conf'
254-
when '10'
255-
'/etc/php/7.3/fpm/pool.d/www.conf'
256-
else
257-
'/etc/php5/fpm/pool.d/www.conf'
258-
end
187+
{
188+
'13' => '/etc/php/8.4/fpm/pool.d/www.conf',
189+
'12' => '/etc/php/8.2/fpm/pool.d/www.conf',
190+
'11' => '/etc/php/7.4/fpm/pool.d/www.conf',
191+
}[facts[:os]['release']['major']]
259192
when 'Ubuntu'
260-
case facts[:os]['release']['major']
261-
when '24.04'
262-
'/etc/php/8.3/fpm/pool.d/www.conf'
263-
when '22.04'
264-
'/etc/php/8.1/fpm/pool.d/www.conf'
265-
when '20.04'
266-
'/etc/php/7.4/fpm/pool.d/www.conf'
267-
when '18.04'
268-
'/etc/php/7.2/fpm/pool.d/www.conf'
269-
else
270-
'/etc/php5/fpm/pool.d/www.conf'
271-
end
193+
{
194+
'24.04' => '/etc/php/8.3/fpm/pool.d/www.conf',
195+
'22.04' => '/etc/php/8.1/fpm/pool.d/www.conf',
196+
}[facts[:os]['release']['major']]
272197
end
273198
when 'Archlinux'
274199
'/etc/php/php-fpm.d/www.conf'
@@ -300,31 +225,16 @@
300225
when 'Debian'
301226
case facts[:os]['name']
302227
when 'Debian'
303-
case facts[:os]['release']['major']
304-
when '13'
305-
'/etc/php/8.4/fpm/pool.d/www.conf'
306-
when '12'
307-
'/etc/php/8.2/fpm/pool.d/www.conf'
308-
when '11'
309-
'/etc/php/7.4/fpm/pool.d/www.conf'
310-
when '10'
311-
'/etc/php/7.3/fpm/pool.d/www.conf'
312-
else
313-
'/etc/php5/fpm/pool.d/www.conf'
314-
end
228+
{
229+
'13' => '/etc/php/8.4/fpm/pool.d/www.conf',
230+
'12' => '/etc/php/8.2/fpm/pool.d/www.conf',
231+
'11' => '/etc/php/7.4/fpm/pool.d/www.conf',
232+
}[facts[:os]['release']['major']]
315233
when 'Ubuntu'
316-
case facts[:os]['release']['major']
317-
when '24.04'
318-
'/etc/php/8.3/fpm/pool.d/www.conf'
319-
when '22.04'
320-
'/etc/php/8.1/fpm/pool.d/www.conf'
321-
when '20.04'
322-
'/etc/php/7.4/fpm/pool.d/www.conf'
323-
when '18.04'
324-
'/etc/php/7.2/fpm/pool.d/www.conf'
325-
else
326-
'/etc/php5/fpm/pool.d/www.conf'
327-
end
234+
{
235+
'24.04' => '/etc/php/8.3/fpm/pool.d/www.conf',
236+
'22.04' => '/etc/php/8.1/fpm/pool.d/www.conf',
237+
}[facts[:os]['release']['major']]
328238
end
329239
when 'Archlinux'
330240
'/etc/php/php-fpm.d/www.conf'

0 commit comments

Comments
 (0)