Merge "Disable apache's purge_configs option"
This commit is contained in:
commit
2090c0a7e8
@ -27,6 +27,13 @@ class osnailyfacter::apache_mpm {
|
|||||||
$mpm_module = 'worker'
|
$mpm_module = 'worker'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tidy { "remove-distro-mpm-modules":
|
||||||
|
path => $::apache::params::mod_enable_dir,
|
||||||
|
recurse => true,
|
||||||
|
matches => [ '*mpm*' ],
|
||||||
|
rmdirs => false,
|
||||||
|
}
|
||||||
|
|
||||||
class { "::apache::mod::$mpm_module":
|
class { "::apache::mod::$mpm_module":
|
||||||
startservers => $startservers,
|
startservers => $startservers,
|
||||||
maxclients => $maxclients,
|
maxclients => $maxclients,
|
||||||
|
@ -6,7 +6,7 @@ sysctl::value { 'net.ipv4.tcp_max_syn_backlog': value => '8192' }
|
|||||||
|
|
||||||
# Listen directives with host required for ip_based vhosts
|
# Listen directives with host required for ip_based vhosts
|
||||||
class { 'osnailyfacter::apache':
|
class { 'osnailyfacter::apache':
|
||||||
purge_configs => true,
|
purge_configs => false,
|
||||||
listen_ports => hiera_array('apache_ports', ['0.0.0.0:80']),
|
listen_ports => hiera_array('apache_ports', ['0.0.0.0:80']),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,6 +43,11 @@ describe manifest do
|
|||||||
:mode => '0755').with_content(/^sleep \d+/)
|
:mode => '0755').with_content(/^sleep \d+/)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'should not purge config files' do
|
||||||
|
should contain_class('apache').with(
|
||||||
|
'purge_configs' => 'false',
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
test_ubuntu_and_centos manifest
|
test_ubuntu_and_centos manifest
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user