Skip to content

Commit fb2a84f

Browse files
smortexsmortex
committed
(IAC-1186) Adjust CI
1 parent 06f04ad commit fb2a84f

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

‎manifests/vhost/fragment.pp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#
5656
define apache::vhost::fragment (
5757
String[1] $vhost,
58+
Optional[Integer[0]] $port = undef,
5859
$priority = undef,
5960
Optional[String] $content = undef,
6061
Integer[0] $order = 900,
@@ -68,7 +69,10 @@
6869
$priority_real = '25-'
6970
}
7071

71-
$filename = regsubst($vhost, ' ', '_', 'G')
72+
$filename = $port ? {
73+
Integer => regsubst("${vhost}-${port}", ' ', '_', 'G'),
74+
Undef => regsubst($vhost, ' ', '_', 'G'),
75+
}
7276

7377
if $content =~ String[1] {
7478
concat::fragment { "${vhost}-${title}":

‎spec/acceptance/apache_ssl_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class { 'apache':
3030
end
3131
end
3232

33-
describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
33+
describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
3434
it { is_expected.to be_file }
3535
it { is_expected.to contain 'SSLCertificateFile "/tmp/ssl_cert"' }
3636
it { is_expected.to contain 'SSLCertificateKeyFile "/tmp/ssl_key"' }

‎spec/acceptance/vhost_spec.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ class { 'apache':
2525
apply_manifest(pp, catch_failures: true)
2626
end
2727

28-
describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
28+
describe file("#{apache_hash['vhost_dir']}/15-default-80.conf") do
2929
it { is_expected.not_to be_file }
3030
end
3131

32-
describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
32+
describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
3333
it { is_expected.not_to be_file }
3434
end
3535
end
@@ -42,11 +42,11 @@ class { 'apache': }
4242
apply_manifest(pp, catch_failures: true)
4343
end
4444

45-
describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
45+
describe file("#{apache_hash['vhost_dir']}/15-default-80.conf") do
4646
it { is_expected.to contain '<VirtualHost \*:80>' }
4747
end
4848

49-
describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
49+
describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
5050
it { is_expected.not_to be_file }
5151
end
5252
end
@@ -67,11 +67,11 @@ class { 'apache':
6767
apply_manifest(pp, catch_failures: true)
6868
end
6969

70-
describe file("#{apache_hash['vhost_dir']}/15-default.conf") do
70+
describe file("#{apache_hash['vhost_dir']}/15-default-80.conf") do
7171
it { is_expected.to contain '<VirtualHost \*:80>' }
7272
end
7373

74-
describe file("#{apache_hash['vhost_dir']}/15-default-ssl.conf") do
74+
describe file("#{apache_hash['vhost_dir']}/15-default-ssl-443.conf") do
7575
it { is_expected.to contain '<VirtualHost \*:443>' }
7676
it { is_expected.to contain 'SSLEngine on' }
7777
end

‎spec/defines/vhost_fragment_spec.rb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
let(:params) do
1515
{
1616
vhost: 'default',
17+
port: 80,
1718
priority: '15',
1819
}
1920
end
@@ -23,9 +24,9 @@
2324

2425
it 'creates a vhost concat fragment' do
2526
is_expected.to compile.with_all_deps
26-
is_expected.to contain_concat('15-default.conf')
27+
is_expected.to contain_concat('15-default-80.conf')
2728
is_expected.to create_concat__fragment('default-myfragment')
28-
.with_target('15-default.conf')
29+
.with_target('15-default-80.conf')
2930
.with_order(900)
3031
.with_content('# Foo')
3132
end
@@ -36,7 +37,7 @@
3637

3738
it 'does not create a vhost concat fragment' do
3839
is_expected.to compile.with_all_deps
39-
is_expected.to contain_concat('15-default.conf')
40+
is_expected.to contain_concat('15-default-80.conf')
4041
is_expected.not_to contain_concat__fragment('default-myfragment')
4142
end
4243
end

‎spec/spec_helper_acceptance_local.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def apache_settings_hash
8989
apache['conf_file'] = '/etc/httpd/conf/httpd.conf'
9090
apache['ports_file'] = '/etc/httpd/conf/ports.conf'
9191
apache['vhost_dir'] = '/etc/httpd/conf.d'
92-
apache['vhost'] = '/etc/httpd/conf.d/15-default.conf'
92+
apache['vhost'] = '/etc/httpd/conf.d/15-default-80.conf'
9393
apache['run_dir'] = '/var/run/httpd'
9494
apache['doc_root'] = '/var/www'
9595
apache['service_name'] = 'httpd'
@@ -119,7 +119,7 @@ def apache_settings_hash
119119
apache['mod_dir'] = '/etc/apache2/mods-available'
120120
apache['conf_file'] = '/etc/apache2/apache2.conf'
121121
apache['ports_file'] = '/etc/apache2/ports.conf'
122-
apache['vhost'] = '/etc/apache2/sites-available/15-default.conf'
122+
apache['vhost'] = '/etc/apache2/sites-available/15-default-80.conf'
123123
apache['vhost_dir'] = '/etc/apache2/sites-enabled'
124124
apache['run_dir'] = '/var/run/apache2'
125125
apache['doc_root'] = '/var/www'
@@ -141,7 +141,7 @@ def apache_settings_hash
141141
apache['mod_dir'] = '/usr/local/etc/apache24/Modules'
142142
apache['conf_file'] = '/usr/local/etc/apache24/httpd.conf'
143143
apache['ports_file'] = '/usr/local/etc/apache24/Includes/ports.conf'
144-
apache['vhost'] = '/usr/local/etc/apache24/Vhosts/15-default.conf'
144+
apache['vhost'] = '/usr/local/etc/apache24/Vhosts/15-default-80.conf'
145145
apache['vhost_dir'] = '/usr/local/etc/apache24/Vhosts'
146146
apache['run_dir'] = '/var/run/apache24'
147147
apache['doc_root'] = '/var/www'
@@ -155,7 +155,7 @@ def apache_settings_hash
155155
apache['mod_dir'] = '/etc/apache2/modules.d'
156156
apache['conf_file'] = '/etc/apache2/httpd.conf'
157157
apache['ports_file'] = '/etc/apache2/ports.conf'
158-
apache['vhost'] = '/etc/apache2/vhosts.d/15-default.conf'
158+
apache['vhost'] = '/etc/apache2/vhosts.d/15-default-80.conf'
159159
apache['vhost_dir'] = '/etc/apache2/vhosts.d'
160160
apache['run_dir'] = '/var/run/apache2'
161161
apache['doc_root'] = '/var/www'
@@ -169,7 +169,7 @@ def apache_settings_hash
169169
apache['mod_dir'] = '/etc/apache2/mods-available'
170170
apache['conf_file'] = '/etc/apache2/httpd.conf'
171171
apache['ports_file'] = '/etc/apache2/ports.conf'
172-
apache['vhost'] = '/etc/apache2/sites-available/15-default.conf'
172+
apache['vhost'] = '/etc/apache2/sites-available/15-default-80.conf'
173173
apache['vhost_dir'] = '/etc/apache2/sites-available'
174174
apache['run_dir'] = '/var/run/apache2'
175175
apache['doc_root'] = '/srv/www'

0 commit comments

Comments
 (0)