opendev
/
puppet-etherpad_lite
Code Issues Proposed changes

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: I45be21c08d5ccdccbf0a8c386b794e2d75cdff45
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-09 16:29:16 -04:00
parent 7f24b5ee7c
commit 61b6b1f69d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/apache.pp
View File

@ -16,21 +16,21 @@ class etherpad_lite::apache (
ensure => present, ensure => present,
} }
include apache include httpd
apache::vhost { $vhost_name: httpd::vhost { $vhost_name:
port => 443, port => 443,
docroot => $docroot, docroot => $docroot,
priority => '50', priority => '50',
template => 'etherpad_lite/etherpadlite.vhost.erb', template => 'etherpad_lite/etherpadlite.vhost.erb',
ssl => true, ssl => true,
} }
a2mod { 'rewrite': httpd_mod { 'rewrite':
ensure => present, ensure => present,
} }
a2mod { 'proxy': httpd_mod { 'proxy':
ensure => present, ensure => present,
} }
a2mod { 'proxy_http': httpd_mod { 'proxy_http':
ensure => present, ensure => present,
} }
@ -91,7 +91,7 @@ class etherpad_lite::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],
} }
} }
@ -102,7 +102,7 @@ class etherpad_lite::apache (
mode => '0640', mode => '0640',
content => $ssl_key_file_contents, content => $ssl_key_file_contents,
require => Package['ssl-cert'], require => Package['ssl-cert'],
before => Apache::Vhost[$vhost_name], before => Httpd::Vhost[$vhost_name],
} }
} }
@ -112,7 +112,7 @@ class etherpad_lite::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],
} }
} }
} }