Merge "Migrate to puppet-httpd module"

This commit is contained in:
Jenkins 2015-07-22 17:23:07 +00:00 committed by Gerrit Code Review
commit f8b6caf0bc

View File

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