diff --git a/manifests/web.pp b/manifests/web.pp index 560ef23..267f74d 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -46,14 +46,14 @@ class logstash::web ( $discover_nodes = ['localhost:9200'], $proxy_elasticsearch = false ) { - include apache - a2mod { 'rewrite': + include ::httpd + httpd_mod { 'rewrite': ensure => present, } - a2mod { 'proxy': + httpd_mod { 'proxy': ensure => present, } - a2mod { 'proxy_http': + httpd_mod { 'proxy_http': ensure => present, } @@ -92,7 +92,7 @@ class logstash::web ( } } - apache::vhost { $vhost_name: + ::httpd::vhost { $vhost_name: port => 80, docroot => 'MEANINGLESS ARGUMENT', priority => '50', diff --git a/metadata.json b/metadata.json index 45cce75..5a8ba32 100644 --- a/metadata.json +++ b/metadata.json @@ -8,7 +8,7 @@ "project_page": "http://docs.openstack.org/infra/system-config/", "issues_url": "https://storyboard.openstack.org/#!/project/763", "dependencies": [ - {"name":"puppetlabs/apache","version_requirement":">= 0.0.3 <0.0.5"}, + {"name":"openstackinfra/httpd","version_requirement":"0.x"}, {"name":"openstackinfra/logrotate"} ] }