Skip to content

vhost: Allow customizing show_diff #2536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2024
Merged

vhost: Allow customizing show_diff #2536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions manifests/vhost.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@
# @param ensure
# Specifies if the virtual host is present or absent.<br />
#
# @param show_diff
# Specifies whether to set the show_diff parameter for the file resource.
#
# @param fallbackresource
# Sets the [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource)
# directive, which specifies an action to take for any URL that doesn't map to anything in
Expand Down Expand Up @@ -1836,6 +1839,7 @@
Variant[Array[String], String] $setenvifnocase = [],
Variant[Array[String], String] $block = [],
Enum['absent', 'present'] $ensure = 'present',
Boolean $show_diff = true,
Optional[String] $wsgi_application_group = undef,
Optional[Variant[String, Hash]] $wsgi_daemon_process = undef,
Optional[Hash] $wsgi_daemon_process_options = undef,
Expand Down Expand Up @@ -2195,14 +2199,15 @@
}

concat { "${priority_real}${filename}.conf":
ensure => $ensure,
path => "${apache::vhost_dir}/${priority_real}${filename}.conf",
owner => 'root',
group => $apache::params::root_group,
mode => $apache::file_mode,
order => 'numeric',
require => Package['httpd'],
notify => Class['apache::service'],
ensure => $ensure,
path => "${apache::vhost_dir}/${priority_real}${filename}.conf",
owner => 'root',
group => $apache::params::root_group,
mode => $apache::file_mode,
show_diff => $show_diff,
order => 'numeric',
require => Package['httpd'],
notify => Class['apache::service'],
}
# NOTE(pabelanger): This code is duplicated in ::apache::vhost::custom and
# needs to be converted into something generic.
Expand Down
5 changes: 4 additions & 1 deletion spec/defines/vhost_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@
it {
expect(subject).to contain_concat('30-rspec.example.com.conf').with('owner' => 'root',
'mode' => '0644',
'show_diff' => true,
'require' => 'Package[httpd]',
'notify' => 'Class[Apache::Service]')
}
Expand Down Expand Up @@ -1527,6 +1528,7 @@
'error_log_pipe' => '/dev/null',
'docroot' => '/var/www/foo',
'ensure' => 'absent',
'show_diff' => false,
'manage_docroot' => true,
'logroot' => '/tmp/logroot',
'logroot_ensure' => 'absent'
Expand Down Expand Up @@ -1556,7 +1558,8 @@
}

it {
expect(subject).to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent')
expect(subject).to contain_concat('25-rspec.example.com.conf').with('ensure' => 'absent',
'show_diff' => false)
}

it { is_expected.to contain_concat__fragment('rspec.example.com-apache-header') }
Expand Down