Remove logic to check for puppetlabs-apache

Now that puppet-httpd has been fully migrated too, we can remove this
obsolete logic.

Change-Id: I7d796a2808891fb686a753d3148204e305b88606
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-08-19 09:50:10 -04:00
parent eb6f0e587f
commit da89a62596
2 changed files with 5 additions and 22 deletions

View File

@ -1,11 +1,5 @@
class meetbot {
# 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,

View File

@ -13,22 +13,11 @@ define meetbot::site(
$varlib = "/var/lib/meetbot/${name}"
$meetbot = "/srv/meetbot-${name}"
# 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',
}
::httpd::vhost { $vhost_name:
port => 80,
docroot => "/srv/meetbot-${name}",
priority => '50',
template => 'meetbot/vhost.erb',
}
file { $varlib: