diff --git a/manifests/init.pp b/manifests/init.pp index f3e347f..3c53cd5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/manifests/site.pp b/manifests/site.pp index a5541b5..47f4026 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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: