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