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: Idff8228de0a5c309b02d95feb6e6f25aafaa5f2a Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
db58618c89
commit
60d1e2b295
@ -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',
|
||||
|
@ -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"}
|
||||
]
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user