Skip to content

Commit 2b060c3

Browse files
dinesh-gujardinesh-gujar
authored
Merge branch 'main' into CAT-1347-erb-to-epp-conversion-vhost-files
2 parents df1825f + 2ea8841 commit 2b060c3

File tree

11 files changed

+26
-94
lines changed

11 files changed

+26
-94
lines changed

‎manifests/params.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@
378378
'9' => '7.0', # Debian Stretch
379379
'10' => '7.3', # Debian Buster
380380
'11' => '7.4', # Debian Bullseye
381+
'12' => '8.2', # Debian Bookworm
381382
'20.04' => '7.4', # Ubuntu Foccal Fossal
382383
'22.04' => '8.1', # Ubuntu Jammy
383384
default => '7.2', # Ubuntu Bionic, Cosmic and Disco

‎metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
"operatingsystem": "Debian",
5050
"operatingsystemrelease": [
5151
"10",
52-
"11"
52+
"11",
53+
"12"
5354
]
5455
},
5556
{

‎spec/acceptance/itk_spec.rb

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,22 @@
55
case os[:family]
66
when 'debian', 'ubuntu'
77
service_name = 'apache2'
8-
variant = :prefork
98
when 'redhat'
10-
unless %r{^5}.match?(os[:release])
11-
variant = (os[:release].to_i >= 7) ? :prefork : :itk_only
12-
service_name = 'httpd'
13-
end
9+
service_name = 'httpd'
1410
when 'freebsd'
1511
service_name = 'apache24'
16-
variant = :prefork
1712
end
1813

1914
# IAC-787: The http-itk mod package is not available in any of the standard RHEL/CentOS 8.x repos. Disable this test
2015
# on those platforms until we can find a suitable source for this package.
2116
describe 'apache::mod::itk class', if: service_name && mod_supported_on_platform?('apache::mod::itk') do
2217
describe 'running puppet code' do
23-
let(:pp) do
24-
case variant
25-
when :prefork
26-
<<-MANIFEST
18+
pp = <<-MANIFEST
2719
class { 'apache':
2820
mpm_module => 'prefork',
2921
}
3022
class { 'apache::mod::itk': }
31-
MANIFEST
32-
when :itk_only
33-
<<-MANIFEST
34-
class { 'apache':
35-
mpm_module => 'itk',
36-
}
37-
MANIFEST
38-
end
39-
end
23+
MANIFEST
4024

4125
it 'behaves idempotently' do
4226
idempotent_apply(pp)

‎spec/acceptance/mod_php_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ class { 'apache::mod::php': }
3636
describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
3737
it { is_expected.to contain 'DirectoryIndex index.php' }
3838
end
39+
elsif os[:family] == 'debian' && os[:release] =~ %r{^12\.}
40+
describe file("#{apache_hash['mod_dir']}/php8.2.conf") do
41+
it { is_expected.to contain 'DirectoryIndex index.php' }
42+
end
3943
elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
4044
describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
4145
it { is_expected.to contain 'DirectoryIndex index.php' }

‎spec/classes/mod/lbmethod_bybusyness.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@
1717
# rubocop:disable Layout/LineLength
1818
expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
1919
'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
20-
}
21-
end
22-
end
23-
24-
context 'on a RedHat OS' do
25-
include_examples 'RedHat 6'
26-
27-
context 'with Apache version >= 2.4' do
28-
let :params do
29-
{
30-
apache_version: '2.4'
31-
}
32-
end
33-
34-
it {
35-
expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
36-
'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
3720
# rubocop:enable Layout/LineLength
3821
}
3922
end

‎spec/classes/mod/lbmethod_byrequests.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@
1717
# rubocop:disable Layout/LineLength
1818
expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
1919
'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
20-
}
21-
end
22-
end
23-
24-
context 'on a RedHat OS' do
25-
include_examples 'RedHat 6'
26-
27-
context 'with Apache version >= 2.4' do
28-
let :params do
29-
{
30-
apache_version: '2.4'
31-
}
32-
end
33-
34-
it {
35-
expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
36-
'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
3720
# rubocop:enable Layout/LineLength
3821
}
3922
end

‎spec/classes/mod/lbmethod_bytraffic.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@
1717
# rubocop:disable Layout/LineLength
1818
expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
1919
'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
20-
}
21-
end
22-
end
23-
24-
context 'on a RedHat OS' do
25-
include_examples 'RedHat 6'
26-
27-
context 'with Apache version >= 2.4' do
28-
let :params do
29-
{
30-
apache_version: '2.4'
31-
}
32-
end
33-
34-
it {
35-
expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
36-
'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
3720
# rubocop:enable Layout/LineLength
3821
}
3922
end

‎spec/classes/mod/lbmethod_heartbeat.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@
1717
# rubocop:disable Layout/LineLength
1818
expect(subject).to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
1919
'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
20-
}
21-
end
22-
end
23-
24-
context 'on a RedHat OS' do
25-
include_examples 'RedHat 6'
26-
27-
context 'with Apache version >= 2.4' do
28-
let :params do
29-
{
30-
apache_version: '2.4'
31-
}
32-
end
33-
34-
it {
35-
expect(subject).to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
36-
'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
3720
# rubocop:enable Layout/LineLength
3821
}
3922
end

‎spec/classes/mod/php_spec.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@
8484
}
8585
end
8686
end
87+
when '12'
88+
context 'on bookworm' do
89+
it { is_expected.to contain_apache__mod('php8.2') }
90+
it { is_expected.to contain_package('libapache2-mod-php8.2') }
91+
92+
it {
93+
expect(subject).to contain_file('php8.2.load').with(
94+
content: "LoadModule php8_module /usr/lib/apache2/modules/libphp8.2.so\n",
95+
)
96+
}
97+
end
8798
when '18.04'
8899
context 'on bionic' do
89100
let :params do

‎spec/defines/vhost_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,8 +2020,7 @@
20202020
it { is_expected.to compile }
20212021
it { is_expected.to contain_concat('25-rspec.example.com.conf') }
20222022

2023-
if (os_facts[:os]['family'] == 'RedHat' && os_facts[:os]['release']['major'].to_i > 6) ||
2024-
(os_facts[:os]['name'] == 'SLES' && os_facts[:os]['release']['major'].to_i > 11)
2023+
if os_facts[:os]['family'] == 'RedHat' || os_facts[:os]['name'] == 'SLES'
20252024
it {
20262025
expect(subject).to contain_concat__fragment('rspec.example.com-directories').with(
20272026
content: %r{^\s+Require all granted$},

‎spec/util/apache_mod_platform_compatibility_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
foobar_linux = 'foobar_linux'
1313

1414
expected_compatible_platform_versions = {
15-
'redhat' => [6, 7, 8],
16-
'centos' => [6, 7, 8],
17-
'oraclelinux' => [6, 7],
18-
'scientific' => [6, 7],
15+
'redhat' => [7, 8],
16+
'centos' => [7, 8],
17+
'oraclelinux' => [7],
18+
'scientific' => [7],
1919
'debian' => [8, 9, 10],
2020
'sles' => [11, 12, 15],
2121
'ubuntu' => [14, 16, 18]

0 commit comments

Comments
 (0)