opendev/system-config
Code Issues Proposed changes

Cleanup mailman manifest init.pp lint errors.

Browse Source 
Change-Id: I387b377d65fbbe49581fa85a371d214ad60e4552
Reviewed-on: https://review.openstack.org/14908
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Matthew Wagoner 2012-10-26 14:48:53 -04:00 committed by Jenkins
parent d9ca4564ec
commit df9583aaf4
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/mailman/manifests/init.pp
View File

@ -1,39 +1,41 @@
class mailman($vhost_name=$fqdn) { # == Class: mailman
#
class mailman($vhost_name=$::fqdn) {
include apache include apache
package { "mailman": package { 'mailman':
ensure => installed, ensure => installed,
} }
apache::vhost { $vhost_name: apache::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': a2mod { 'rewrite':
ensure => present ensure => present,
} }
file { "/var/www/index.html": file { '/var/www/index.html':
ensure => present,
source => 'puppet:///modules/mailman/index.html', source => 'puppet:///modules/mailman/index.html',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
ensure => 'present', replace => true,
replace => 'true', mode => '0444',
mode => 444, require => Package['apache2'],
require => Package["apache2"],
} }
file { '/etc/mailman/mm_cfg.py': file { '/etc/mailman/mm_cfg.py':
ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => 444, mode => '0444',
ensure => 'present',
content => template('mailman/mm_cfg.py.erb'), content => template('mailman/mm_cfg.py.erb'),
replace => 'true', replace => true,
require => Package["mailman"] require => Package['mailman'],
} }
service { 'mailman': service { 'mailman':
@ -41,18 +43,16 @@ class mailman($vhost_name=$fqdn) {
hasrestart => true, hasrestart => true,
hasstatus => false, hasstatus => false,
subscribe => File['/etc/mailman/mm_cfg.py'], subscribe => File['/etc/mailman/mm_cfg.py'],
require => Package["mailman"] require => Package['mailman'],
} }
file { '/etc/mailman/en': file { '/etc/mailman/en':
ensure => directory,
owner => 'root', owner => 'root',
group => 'list', group => 'list',
mode => 644, mode => '0644',
ensure => 'directory',
recurse => true, recurse => true,
require => Package['mailman'], require => Package['mailman'],
source => [ source => 'puppet:///modules/mailman/html-templates-en',
"puppet:///modules/mailman/html-templates-en",
],
} }
} }