opendev
/
puppet-jenkins
Code Issues Proposed changes

Merge "Fix race condition in httpd install and config"

This commit is contained in:
Jenkins 2015-11-23 12:28:35 +00:00 committed by Gerrit Code Review
parent 3501262d49 9c6b9c0e1d
commit bc61fdc06d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/master.pp
View File

@ -48,23 +48,23 @@ class jenkins::master(
template => 'jenkins/jenkins.vhost.erb',
ssl => true,
}
if ! defined(Httpd_mod['rewrite']) {
httpd_mod { 'rewrite':
if ! defined(Httpd::Mod['rewrite']) {
httpd::mod { 'rewrite':
ensure => present,
}
}
if ! defined(Httpd_mod['proxy']) {
httpd_mod { 'proxy':
if ! defined(Httpd::Mod['proxy']) {
httpd::mod { 'proxy':
ensure => present,
}
}
if ! defined(Httpd_mod['proxy_http']) {
httpd_mod { 'proxy_http':
if ! defined(Httpd::Mod['proxy_http']) {
httpd::mod { 'proxy_http':
ensure => present,
}
}
if ! defined(Httpd_mod['headers']) {
httpd_mod { 'headers':
if ! defined(Httpd::Mod['headers']) {
httpd::mod { 'headers':
ensure => present,
}
}