opendev/puppet-zanata
Code Issues Proposed changes

Migrate to puppet-httpd module

Browse Source 
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: Id258092e1c1e21800c24512b5bdfee45b0939bca
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-14 15:09:26 -04:00
parent 553733379f
commit 27240c64bc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/apache.pp
View File

@ -26,22 +26,22 @@ class zanata::apache (
$ssl_chain_file_contents = '', # If left empty puppet will not create file. $ssl_chain_file_contents = '', # If left empty puppet will not create file.
) { ) {
include ::apache include ::httpd
include ::apache::ssl include ::httpd::ssl
a2mod { 'proxy': httpd_mod { 'proxy':
ensure => present, ensure => present,
} }
a2mod { 'proxy_http': httpd_mod { 'proxy_http':
ensure => present, ensure => present,
} }
a2mod { 'proxy_ajp': httpd_mod { 'proxy_ajp':
ensure => present, ensure => present,
} }
apache::vhost { $vhost_name: ::httpd::vhost { $vhost_name:
port => 443, port => 443,
docroot => 'MEANINGLESS ARGUMENT', docroot => 'MEANINGLESS ARGUMENT',
priority => '50', priority => '50',
@ -56,7 +56,7 @@ class zanata::apache (
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $ssl_cert_file_contents, content => $ssl_cert_file_contents,
before => Apache::Vhost[$vhost_name], before => Httpd::Vhost[$vhost_name],
} }
} }
@ -66,7 +66,7 @@ class zanata::apache (
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $ssl_key_file_contents, content => $ssl_key_file_contents,
before => Apache::Vhost[$vhost_name], before => Httpd::Vhost[$vhost_name],
} }
} }
@ -76,7 +76,7 @@ class zanata::apache (
group => 'root', group => 'root',
mode => '0640', mode => '0640',
content => $ssl_chain_file_contents, content => $ssl_chain_file_contents,
before => Apache::Vhost[$vhost_name], before => Httpd::Vhost[$vhost_name],
} }
} }