opendev/system-config
Code Issues Proposed changes

Merge "Adds ! defined() guards around a2mod declarations"

Browse Source
This commit is contained in:
Jenkins 2014-03-06 07:37:32 +00:00 committed by Gerrit Code Review
commit d776f77f91
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/jenkins/manifests/master.pp
View File

@ -51,15 +51,21 @@ class jenkins::master(
template => 'jenkins/jenkins.vhost.erb', template => 'jenkins/jenkins.vhost.erb',
ssl => true, ssl => true,
} }
if ! defined(A2mod['rewrite']) {
a2mod { 'rewrite': a2mod { 'rewrite':
ensure => present, ensure => present,
} }
}
if ! defined(A2mod['proxy']) {
a2mod { 'proxy': a2mod { 'proxy':
ensure => present, ensure => present,
} }
}
if ! defined(A2mod['proxy_http']) {
a2mod { 'proxy_http': a2mod { 'proxy_http':
ensure => present, ensure => present,
} }
}
if $ssl_cert_file_contents != '' { if $ssl_cert_file_contents != '' {
file { $ssl_cert_file: file { $ssl_cert_file:

6
modules/zuul/manifests/init.pp
View File

@ -231,13 +231,19 @@ class zuul (
priority => '50', priority => '50',
template => 'zuul/zuul.vhost.erb', template => 'zuul/zuul.vhost.erb',
} }
if ! defined(A2mod['rewrite']) {
a2mod { 'rewrite': a2mod { 'rewrite':
ensure => present, ensure => present,
} }
}
if ! defined(A2mod['proxy']) {
a2mod { 'proxy': a2mod { 'proxy':
ensure => present, ensure => present,
} }
}
if ! defined(A2mod['proxy_http']) {
a2mod { 'proxy_http': a2mod { 'proxy_http':
ensure => present, ensure => present,
} }
} }
}