tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

smtpd: Lint fixes

Browse source
This commit is contained in:
Ossi Salmi 2015-06-24 00:41:42 +03:00
parent ae83203af9
commit f0cb48a3eb
1 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

190
smtpd/manifests/init.pp
View file

@ -41,7 +41,7 @@ class smtpd(
$mailserver=undef, $mailserver=undef,
$listen=false, $listen=false,
$gecos=true, $gecos=true,
$maildir="Mail", $maildir='Mail',
$config=undef, $config=undef,
$custom=undef, $custom=undef,
$domains=undef, $domains=undef,
@ -50,20 +50,20 @@ class smtpd(
$ssl_cert="${::puppet_ssldir}/certs/${::homename}.pem" $ssl_cert="${::puppet_ssldir}/certs/${::homename}.pem"
) { ) {
if $listen == true and $::operatingsystem != "OpenBSD" { if $listen == true and $::operatingsystem != 'OpenBSD' {
fail("listen only supported on OpenBSD") fail('listen only supported on OpenBSD')
} }
case $::operatingsystem { case $::operatingsystem {
"centos","redhat": { 'centos','redhat': {
if versioncmp($::operatingsystemrelease, "6") < 0 { if versioncmp($::operatingsystemrelease, '6') < 0 {
fail("smtpd requires atleast ${::operatingsystem} 6") fail("smtpd requires atleast ${::operatingsystem} 6")
} }
$package = "opensmtpd" $package = 'opensmtpd'
$service = "opensmtpd" $service = 'opensmtpd'
$confdir = "/etc/opensmtpd" $confdir = '/etc/opensmtpd'
$aliases = "/etc/aliases" $aliases = '/etc/aliases'
$mda = undef $mda = undef
package { $package: package { $package:
@ -71,27 +71,27 @@ class smtpd(
before => File["${confdir}/smtpd.conf"], before => File["${confdir}/smtpd.conf"],
} }
exec { "/usr/sbin/alternatives --set mta /usr/sbin/sendmail.opensmtpd": exec { '/usr/sbin/alternatives --set mta /usr/sbin/sendmail.opensmtpd':
refreshonly => true, refreshonly => true,
subscribe => Package[$package], subscribe => Package[$package],
before => Service[$service], before => Service[$service],
} }
service { [ "postfix", "sendmail" ]: service { [ 'postfix', 'sendmail' ]:
ensure => stopped, ensure => stopped,
enable => false, enable => false,
before => Service[$service], before => Service[$service],
} }
} }
"ubuntu": { 'ubuntu': {
if versioncmp($::operatingsystemrelease, "14.04") < 0 { if versioncmp($::operatingsystemrelease, '14.04') < 0 {
fail("smtpd requires atleast ${::operatingsystem} 14.04") fail("smtpd requires atleast ${::operatingsystem} 14.04")
} }
$package = "opensmtpd" $package = 'opensmtpd'
$service = "opensmtpd" $service = 'opensmtpd'
$confdir = "/etc" $confdir = '/etc'
$aliases = "/etc/aliases" $aliases = '/etc/aliases'
$mda = undef $mda = undef
package { $package: package { $package:
@ -99,23 +99,23 @@ class smtpd(
before => File["${confdir}/smtpd.conf"], before => File["${confdir}/smtpd.conf"],
} }
} }
"openbsd": { 'openbsd': {
$package = undef $package = undef
$service = "smtpd" $service = 'smtpd'
$confdir = "/etc/mail" $confdir = '/etc/mail'
$aliases = "/etc/mail/aliases" $aliases = '/etc/mail/aliases'
$mda = "/usr/local/bin/procmail -Y -t -f %{sender}" $mda = '/usr/local/bin/procmail -Y -t -f %{sender}'
file { "/etc/mailer.conf": file { '/etc/mailer.conf':
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => "puppet:///modules/smtpd/mailer.conf", source => 'puppet:///modules/smtpd/mailer.conf',
before => Service[$service], before => Service[$service],
} }
service { "sendmail": service { 'sendmail':
ensure => stopped, ensure => stopped,
enable => false, enable => false,
before => Service[$service], before => Service[$service],
@ -138,18 +138,18 @@ class smtpd(
$content = undef $content = undef
} else { } else {
$content = $listen ? { $content = $listen ? {
true => template("smtpd/server.conf.erb"), true => template('smtpd/server.conf.erb'),
default => template("smtpd/client.conf.erb"), default => template('smtpd/client.conf.erb'),
} }
} }
file { "${confdir}/smtpd.conf": file { "${confdir}/smtpd.conf":
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => $::operatingsystem ? { group => $::operatingsystem ? {
"openbsd" => "wheel", 'openbsd' => 'wheel',
default => "root", default => 'root',
}, },
source => $config, source => $config,
content => $content, content => $content,
@ -160,7 +160,7 @@ class smtpd(
ensure => running, ensure => running,
enable => true, enable => true,
start => $::operatingsystem ? { start => $::operatingsystem ? {
"openbsd" => "/usr/sbin/smtpd", 'openbsd' => '/usr/sbin/smtpd',
default => undef, default => undef,
}, },
} }
@ -168,91 +168,91 @@ class smtpd(
if $listen == true or $config { if $listen == true or $config {
file { "${ssl::private}/smtpd.key": file { "${ssl::private}/smtpd.key":
ensure => present, ensure => present,
mode => "0600", mode => '0600',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => $ssl_key, source => $ssl_key,
notify => Service["smtpd"], notify => Service['smtpd'],
} }
file { "${ssl::certs}/smtpd.crt": file { "${ssl::certs}/smtpd.crt":
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => $ssl_cert, source => $ssl_cert,
notify => Service["smtpd"], notify => Service['smtpd'],
} }
} }
if $listen == true { if $listen == true {
include procmail include procmail
procmail::rc { "00-default.rc": procmail::rc { '00-default.rc':
content => "MAILDIR=\$HOME/${maildir}\nDEFAULT=\$MAILDIR/INBOX\n", content => "MAILDIR=\$HOME/${maildir}\nDEFAULT=\$MAILDIR/INBOX\n",
} }
file { [ "/root/${maildir}", "/etc/skel/${maildir}" ]: file { [ "/root/${maildir}", "/etc/skel/${maildir}" ]:
ensure => directory, ensure => directory,
mode => "0700", mode => '0700',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
before => Service["smtpd"], before => Service['smtpd'],
} }
if $gecos == true { if $gecos == true {
file { "/usr/local/sbin/generate-smtpd-gecos.sh": file { '/usr/local/sbin/generate-smtpd-gecos.sh':
ensure => present, ensure => present,
mode => "0700", mode => '0700',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => "puppet:///modules/smtpd/generate-smtpd-gecos.sh", source => 'puppet:///modules/smtpd/generate-smtpd-gecos.sh',
} }
exec { "/usr/local/sbin/generate-smtpd-gecos.sh": exec { '/usr/local/sbin/generate-smtpd-gecos.sh':
unless => "/bin/test /etc/mail/gecos -nt /etc/passwd", unless => '/bin/test /etc/mail/gecos -nt /etc/passwd',
require => File["/usr/local/sbin/generate-smtpd-gecos.sh"], require => File['/usr/local/sbin/generate-smtpd-gecos.sh'],
notify => Exec["makemap aliases"], notify => Exec['makemap aliases'],
} }
} }
file { "/etc/mail/aliases": file { '/etc/mail/aliases':
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => [ source => [
"puppet:///files/mail/aliases.${::homename}", "puppet:///files/mail/aliases.${::homename}",
"puppet:///files/mail/aliases", 'puppet:///files/mail/aliases',
], ],
} }
exec { "makemap aliases": exec { 'makemap aliases':
command => $gecos ? { command => $gecos ? {
false => "makemap aliases", false => 'makemap aliases',
true => "cat aliases gecos > aliases.gecos && makemap -o aliases.db aliases.gecos", true => 'cat aliases gecos > aliases.gecos && makemap -o aliases.db aliases.gecos',
}, },
refreshonly => true, refreshonly => true,
cwd => "/etc/mail", cwd => '/etc/mail',
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File["/etc/mail/aliases"], subscribe => File['/etc/mail/aliases'],
before => Service["smtpd"], before => Service['smtpd'],
} }
file { "/etc/mail/clients": file { '/etc/mail/clients':
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => [ source => [
"puppet:///files/mail/clients.${::homename}", "puppet:///files/mail/clients.${::homename}",
"puppet:///files/mail/clients", 'puppet:///files/mail/clients',
"puppet:///modules/smtpd/empty", 'puppet:///modules/smtpd/empty',
], ],
} }
exec { "makemap -t set clients": exec { 'makemap -t set clients':
refreshonly => true, refreshonly => true,
cwd => "/etc/mail", cwd => '/etc/mail',
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File["/etc/mail/clients"], subscribe => File['/etc/mail/clients'],
before => Service["smtpd"], before => Service['smtpd'],
} }
if $domains { if $domains {
@ -260,7 +260,7 @@ class smtpd(
gecos => $gecos, gecos => $gecos,
subscribe => $gecos ? { subscribe => $gecos ? {
false => undef, false => undef,
true => Exec["/usr/local/sbin/generate-smtpd-gecos.sh"], true => Exec['/usr/local/sbin/generate-smtpd-gecos.sh'],
}, },
} }
} }
@ -279,13 +279,13 @@ define smtpd::aliases($gecos) {
file { "/etc/mail/aliases.${name}": file { "/etc/mail/aliases.${name}":
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => [ source => [
"puppet:///files/mail/aliases.${name}", "puppet:///files/mail/aliases.${name}",
"puppet:///files/mail/aliases.${::homename}", "puppet:///files/mail/aliases.${::homename}",
"puppet:///files/mail/aliases", 'puppet:///files/mail/aliases',
], ],
} }
exec { "makemap aliases.${name}": exec { "makemap aliases.${name}":
@ -294,10 +294,10 @@ define smtpd::aliases($gecos) {
true => "cat aliases.${name} gecos > aliases.${name}.gecos && makemap -o aliases.${name}.db aliases.${name}.gecos", true => "cat aliases.${name} gecos > aliases.${name}.gecos && makemap -o aliases.${name}.db aliases.${name}.gecos",
}, },
refreshonly => true, refreshonly => true,
cwd => "/etc/mail", cwd => '/etc/mail',
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File["/etc/mail/aliases.${name}"], subscribe => File["/etc/mail/aliases.${name}"],
before => Service["smtpd"], before => Service['smtpd'],
} }
} }
@ -309,21 +309,21 @@ define smtpd::virtual() {
file { "/etc/mail/virtual.${name}": file { "/etc/mail/virtual.${name}":
ensure => present, ensure => present,
mode => "0644", mode => '0644',
owner => "root", owner => 'root',
group => "wheel", group => 'wheel',
source => [ source => [
"puppet:///files/mail/virtual.${name}", "puppet:///files/mail/virtual.${name}",
"puppet:///files/mail/virtual.${::homename}", "puppet:///files/mail/virtual.${::homename}",
"puppet:///files/mail/virtual", 'puppet:///files/mail/virtual',
], ],
} }
exec { "makemap virtual.${name}": exec { "makemap virtual.${name}":
refreshonly => true, refreshonly => true,
cwd => "/etc/mail", cwd => '/etc/mail',
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => '/bin:/usr/bin:/sbin:/usr/sbin',
subscribe => File["/etc/mail/virtual.${name}"], subscribe => File["/etc/mail/virtual.${name}"],
before => Service["smtpd"], before => Service['smtpd'],
} }
} }