opendev
/
puppet-meetbot
Code Issues Proposed changes

Merge "Remove logic to check for puppetlabs-apache"

This commit is contained in:
Jenkins 2015-10-21 03:47:57 +00:00 committed by Gerrit Code Review
parent 33ccecb230 da89a62596
commit a4e8acd612
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
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,

21
manifests/site.pp
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: