opendev
/
puppet-mailman
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: I9ea679048ca764389dbe01581ee35aadcbe6014b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-07-14 15:34:37 -04:00
parent f7bc3034a8
commit bde4c75a0f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -2,19 +2,19 @@
#
class mailman($vhost_name=$::fqdn) {
include apache
include ::httpd
package { 'mailman':
ensure => installed,
}
apache::vhost { $vhost_name:
::httpd::vhost { $vhost_name:
port => 80,
docroot => '/var/www/',
priority => '50',
template => 'mailman/mailman.vhost.erb',
}
a2mod { 'rewrite':
httpd_mod { 'rewrite':
ensure => present,
}
@ -25,7 +25,7 @@ class mailman($vhost_name=$::fqdn) {
group => 'root',
replace => true,
mode => '0444',
require => Package[$::apache::params::apache_name],
require => Httpd::Vhost[$vhost_name],
}
file { '/etc/mailman/mm_cfg.py':