Migrate to puppet-httpd module
puppet-httpd is the openstack-infra version of puppetlabs-apache (0.0.4) release. This patchset will remove the puppetlabs-apache namespace from -infra allowing for possible future patchsets to use newer puppetlabs-apache modules. Change-Id: I39d337bd09ede21289be67c3c2666aa543e3ec3e Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
e6ff4136bb
commit
e3b276c650
|
@ -1,5 +1,11 @@
|
|||
class meetbot {
|
||||
include apache
|
||||
# NOTE(pabelanger): Until we full remove puppetlabs-apache from
|
||||
# system-config, we need to do this hack to avoid a circular dependency.
|
||||
if ! defined(Class['::apache']) {
|
||||
include ::httpd
|
||||
} else {
|
||||
include ::apache
|
||||
}
|
||||
|
||||
vcsrepo { '/opt/meetbot':
|
||||
ensure => latest,
|
||||
|
|
|
@ -13,11 +13,22 @@ define meetbot::site(
|
|||
$varlib = "/var/lib/meetbot/${name}"
|
||||
$meetbot = "/srv/meetbot-${name}"
|
||||
|
||||
apache::vhost { $vhost_name:
|
||||
port => 80,
|
||||
docroot => "/srv/meetbot-${name}",
|
||||
priority => '50',
|
||||
template => 'meetbot/vhost.erb',
|
||||
# NOTE(pabelanger): Until we full remove puppetlabs-apache from
|
||||
# system-config, we need to do this hack to avoid a circular dependency.
|
||||
if ! defined(Class['::apache']) {
|
||||
::httpd::vhost { $vhost_name:
|
||||
port => 80,
|
||||
docroot => "/srv/meetbot-${name}",
|
||||
priority => '50',
|
||||
template => 'meetbot/vhost.erb',
|
||||
}
|
||||
} else {
|
||||
::apache::vhost { $vhost_name:
|
||||
port => 80,
|
||||
docroot => "/srv/meetbot-${name}",
|
||||
priority => '50',
|
||||
template => 'meetbot/vhost.erb',
|
||||
}
|
||||
}
|
||||
|
||||
file { $varlib:
|
||||
|
|
Loading…
Reference in New Issue