Configure apache when we use it

The kibana apache vhost file makes use of mod rewrite and mod proxy but
we don't enable those modules explicitly here. We happen to enable them
in other places that use this puppet module but that leads to races and
isn't explicit enough. Go ahead and explicitly enable the deps in this
puppet module so that it is self sufficient.

Change-Id: Ic05f26d61f2ac4b5adffee98782d1a02931d5731
This commit is contained in:
Clark Boylan 2016-05-26 10:40:37 -07:00
parent 586bb3818b
commit 7904825abb
1 changed files with 22 additions and 1 deletions

View File

@ -59,12 +59,33 @@ class kibana::js (
subscribe => Vcsrepo[$base_path],
}
include ::httpd
if !defined(Httpd_mod['rewrite']) {
httpd_mod { 'rewrite':
ensure => present,
}
}
if !defined(Httpd_mod['proxy']) {
httpd_mod { 'proxy':
ensure => present,
}
}
if !defined(Httpd_mod['proxy_http']) {
httpd_mod { 'proxy_http':
ensure => present,
}
}
httpd::vhost { 'kibana':
docroot => "${base_path}/src",
vhost_name => $vhost_name,
serveraliases => $vhost_aliases,
port => 80,
template => $vhost_template,
require => [
Httpd_mod['rewrite'],
Httpd_mod['proxy'],
Httpd_mod['proxy_http'],
],
}
}