opendev/puppet-zanata
Code Issues Proposed changes

Merge "Migrate to puppet-httpd module"

Browse Source
This commit is contained in:
Jenkins 2015-07-23 20:41:05 +00:00 committed by Gerrit Code Review
commit b54e390e88
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],
} }
} }