Commit 596e6732 authored by Anton Lindström's avatar Anton Lindström
Browse files

make module puppet style guide compliant

Test with puppet parser validate and puppet-lint.
http://docs.puppetlabs.com/guides/style_guide.html
parent eac37058
Loading
Loading
Loading
Loading
+34 −34
Changes for manifests/config.pp: 34 added lines, 34 removed lines.
Original line number Diff line number Diff line
/*
== Definition: postfix::config

Uses the "postconf" command to add/alter/remove options in postfix main
configuation file (/etc/postfix/main.cf).

Parameters:
- *name*: name of the parameter.
- *ensure*: present/absent. defaults to present.
- *value*: value of the parameter.

Requires:
- Class["postfix"]

Example usage:

  node "toto.example.com" {

    include postfix

    postfix::config {
      "smtp_use_tls"            => "yes";
      "smtp_sasl_auth_enable"   => "yes";
      "smtp_sasl_password_maps" => "hash:/etc/postfix/my_sasl_passwords";
      "relayhost"               => "[mail.example.com]:587";
    }
  }

*/
define postfix::config ($ensure = present, $value) {
#
#== Definition: postfix::config
#
#Uses the "postconf" command to add/alter/remove options in postfix main
#configuation file (/etc/postfix/main.cf).
#
#Parameters:
#- *name*: name of the parameter.
#- *ensure*: present/absent. defaults to present.
#- *value*: value of the parameter.
#
#Requires:
#- Class["postfix"]
#
#Example usage:
#
#  node "toto.example.com" {
#
#    include postfix
#
#    postfix::config {
#      "smtp_use_tls"            => "yes";
#      "smtp_sasl_auth_enable"   => "yes";
#      "smtp_sasl_password_maps" => "hash:/etc/postfix/my_sasl_passwords";
#      "relayhost"               => "[mail.example.com]:587";
#    }
#  }
#
#
define postfix::config ($value, $ensure = present) {

  Augeas {
    context => "/files/etc/postfix/main.cf",
    notify  => Service["postfix"],
    require => File["/etc/postfix/main.cf"],
    context => '/files/etc/postfix/main.cf',
    notify  => Service['postfix'],
    require => File['/etc/postfix/main.cf'],
  }

  case $ensure {
@@ -41,11 +41,11 @@ define postfix::config ($ensure = present, $value) {
        changes => "set $name $value",
      }
    }

    absent: {
      augeas { "rm postfix '${name}'":
        changes => "rm $name",
      }
    }
    default: {}
  }
}
+43 −45
Changes for manifests/hash.pp: 43 added lines, 45 removed lines.
Original line number Diff line number Diff line
/*
== Definition: postfix::hash

Creates postfix hashed "map" files. It will create "${name}", and then build
"${name}.db" using the "postmap" command. The map file can then be referred to
using postfix::config.

Parameters:
- *name*: the name of the map file.
- *ensure*: present/absent, defaults to present.
- *source*: file source.

Requires:
- Class["postfix"]

Example usage:

  node "toto.example.com" {

    include postfix

    postfix::hash { "/etc/postfix/virtual":
      ensure => present,
    }
    postfix::config { "virtual_alias_maps":
      value => "hash:/etc/postfix/virtual"
    }
  }

*/
define postfix::hash ($ensure="present", $source = false) {
#== Definition: postfix::hash
#
#Creates postfix hashed "map" files. It will create "${name}", and then build
#"${name}.db" using the "postmap" command. The map file can then be referred to
#using postfix::config.
#
#Parameters:
#- *name*: the name of the map file.
#- *ensure*: present/absent, defaults to present.
#- *source*: file source.
#
#Requires:
#- Class["postfix"]
#
#Example usage:
#
#  node "toto.example.com" {
#
#    include postfix
#
#    postfix::hash { "/etc/postfix/virtual":
#      ensure => present,
#    }
#    postfix::config { "virtual_alias_maps":
#      value => "hash:/etc/postfix/virtual"
#    }
#  }
#
define postfix::hash ($ensure='present', $source = false) {

  # selinux labels differ from one distribution to another
  case $operatingsystem {
  case $::operatingsystem {

    RedHat, CentOS: {
      case $lsbmajdistrelease {
        "4":     { $postfix_seltype = "etc_t" }
        "5","6": { $postfix_seltype = "postfix_etc_t" }
      case $::lsbmajdistrelease {
        '4':     { $postfix_seltype = 'etc_t' }
        '5','6': { $postfix_seltype = 'postfix_etc_t' }
        default: { $postfix_seltype = undef }
      }
    }
@@ -48,40 +46,40 @@ define postfix::hash ($ensure="present", $source = false) {

  case $source {
    false: {
      file {"${name}":
      file {$name:
        ensure  => $ensure,
        mode    => 600,
        mode    => '0600',
        owner   => root,
        group   => root,
        seltype => $postfix_seltype,
        require => Package["postfix"],
        require => Package['postfix'],
      }
    }
    default: {
      file {"${name}":
      file {$name:
        ensure  => $ensure,
        mode    => 600,
        mode    => '0600',
        owner   => root,
        group   => root,
        source  => $source,
        seltype => $postfix_seltype,
        require => Package["postfix"],
        require => Package['postfix'],
      }
    }
  }

  file {"${name}.db":
    ensure  => $ensure,
    mode    => 600,
    require => [File["${name}"], Exec["generate ${name}.db"]],
    mode    => '0600',
    require => [File[$name], Exec["generate ${name}.db"]],
    seltype => $postfix_seltype,
  }

  exec {"generate ${name}.db":
    command     => "postmap ${name}",
    #creates    => "${name}.db", # this prevents postmap from being run !
    subscribe => File["${name}"],
    subscribe   => File[$name],
    refreshonly => true,
    require => Package["postfix"],
    require     => Package['postfix'],
  }
}
+73 −68
Changes for manifests/init.pp: 73 added lines, 68 removed lines.
Original line number Diff line number Diff line
@@ -5,25 +5,26 @@
# delivery and an SMTP server listening on the loopback interface.
#
# Parameters:
# - *$postfix_smtp_listen*: address on which the smtp service will listen to. defaults to 127.0.0.1
# - *$root_mail_recipient*: who will recieve root's emails. defaults to "nobody"
# - *$postfix_smtp_listen*: address on which the smtp service will listen to.
#      defaults to 127.0.0.1
# - *$root_mail_recipient*: who will recieve root's emails. defaults to 'nobody'
#
# Example usage:
#
#   node "toto.example.com" {
#     $postfix_smtp_listen = "192.168.1.10"
#   node 'toto.example.com' {
#     $postfix_smtp_listen = '192.168.1.10'
#     include postfix
#   }
#
class postfix {

  # selinux labels differ from one distribution to another
  case $operatingsystem {
  case $::operatingsystem {

    RedHat, CentOS: {
      case $lsbmajdistrelease {
        "4":     { $postfix_seltype = "etc_t" }
        "5","6": { $postfix_seltype = "postfix_etc_t" }
      case $::lsbmajdistrelease {
        '4':     { $postfix_seltype = 'etc_t' }
        '5','6': { $postfix_seltype = 'postfix_etc_t' }
        default: { $postfix_seltype = undef }
      }
    }
@@ -34,120 +35,124 @@ class postfix {
  }

  # Default value for various options
  case $postfix_smtp_listen {
    "": { $postfix_smtp_listen = "127.0.0.1" }
  if $postfix_smtp_listen == '' {
    $postfix_smtp_listen = '127.0.0.1'
  }
  case $root_mail_recipient {
    "":   { $root_mail_recipient = "nobody" }
  if $root_mail_recipient == '' {
    $root_mail_recipient = 'nobody'
  }
  case $postfix_use_amavisd {
    "": { $postfix_use_amavisd = "no" }
  if $postfix_use_amavisd == '' {
    $postfix_use_amavisd = 'no'
  }
  case $postfix_use_dovecot_lda {
    "": { $postfix_use_dovecot_lda = "no" }
  if $postfix_use_dovecot_lda == '' {
    $postfix_use_dovecot_lda = 'no'
  }
  case $postfix_use_schleuder {
    "": { $postfix_use_schleuder = "no" }
  if $postfix_use_schleuder == '' {
    $postfix_use_schleuder = 'no'
  }
  case $postfix_use_sympa {
    "": { $postfix_use_sympa = "no" }
  if $postfix_use_sympa == '' {
    $postfix_use_sympa = 'no'
  }
  case $postfix_mail_user {
    "": { $postfix_mail_user = "vmail" }
  if $postfix_mail_user == '' {
    $postfix_mail_user = 'vmail'
  }

  $mailx_package = $::lsbdistrelease ? {
    'squeeze' => 'bsd-mailx',
    'lucid'   => 'bsd-mailx',
    default   => 'mailx',
  }

  $master_os_template = $::operatingsystem ? {
    /RedHat|CentOS/          => 'postfix/master.cf.redhat.erb',
    /Debian|Ubuntu|kFreeBSD/ => 'postfix/master.cf.debian.erb',
  }

  package { "postfix":
    ensure => installed
  package { 'postfix':
    ensure => installed,
  }

  package { "mailx":
  package { 'mailx':
    ensure => installed,
    name   => $lsbdistcodename ? {
      "squeeze" => "bsd-mailx",
      "lucid"   => "bsd-mailx",
      default   => "mailx",
    },
    name   => $mailx_package,
  }

  service { "postfix":
  service { 'postfix':
    ensure    => running,
    enable    => true,
    hasstatus => true,
    restart   => "/etc/init.d/postfix reload",
    require   => Package["postfix"],
    restart   => '/etc/init.d/postfix reload',
    require   => Package['postfix'],
  }

  file { "/etc/mailname":
  file { '/etc/mailname':
    ensure  => present,
    content => "${fqdn}\n",
    content => "$::fqdn\n",
    seltype => $postfix_seltype,
  }

  # Aliases
  file { "/etc/aliases":
  file { '/etc/aliases':
    ensure  => present,
    content => "# file managed by puppet\n",
    content => '# file managed by puppet\n',
    replace => false,
    seltype => $postfix_seltype,
    notify => Exec["newaliases"],
    notify  => Exec['newaliases'],
  }

  # Aliases
  exec { "newaliases":
    command     => "/usr/bin/newaliases",
  exec { 'newaliases':
    command     => '/usr/bin/newaliases',
    refreshonly => true,
    require     => Package["postfix"],
    subscribe   => File["/etc/aliases"],
    require     => Package['postfix'],
    subscribe   => File['/etc/aliases'],
  }

  # Config files
  file { "/etc/postfix/master.cf":
  file { '/etc/postfix/master.cf':
    ensure  => present,
    owner => "root",
    group => "root",
    mode => "0644",
    content => $operatingsystem ? {
      /RedHat|CentOS/ => template("postfix/master.cf.redhat.erb", "postfix/master.cf.common.erb"),
      /Debian|Ubuntu|kFreeBSD/ => template("postfix/master.cf.debian.erb", "postfix/master.cf.common.erb"),
    },
    owner   => 'root',
    group   => 'root',
    mode    => '0644',
    content => $master_os_template,
    seltype => $postfix_seltype,
    notify  => Service["postfix"],
    require => Package["postfix"],
    notify  => Service['postfix'],
    require => Package['postfix'],
  }

  # Config files
  file { "/etc/postfix/main.cf":
  file { '/etc/postfix/main.cf':
    ensure  => present,
    owner => "root",
    group => "root",
    mode => "0644",
    source  => "puppet:///modules/postfix/main.cf",
    owner   => 'root',
    group   => 'root',
    mode    => '0644',
    source  => 'puppet:///modules/postfix/main.cf',
    replace => false,
    seltype => $postfix_seltype,
    notify  => Service["postfix"],
    require => Package["postfix"],
    notify  => Service['postfix'],
    require => Package['postfix'],
  }

  # Default configuration parameters
  postfix::config {
    "myorigin":   value => "${fqdn}";
    "alias_maps": value => "hash:/etc/aliases";
    "inet_interfaces": value => "all";
    'myorigin':         value => $::fqdn;
    'alias_maps':       value => 'hash:/etc/aliases';
    'inet_interfaces':  value => 'all';
  }

  case $operatingsystem {
  case $::operatingsystem {
    RedHat, CentOS: {
      postfix::config {
        "sendmail_path": value => "/usr/sbin/sendmail.postfix";
        "newaliases_path": value => "/usr/bin/newaliases.postfix";
        "mailq_path": value => "/usr/bin/mailq.postfix";
        'sendmail_path':    value => '/usr/sbin/sendmail.postfix';
        'newaliases_path':  value => '/usr/bin/newaliases.postfix';
        'mailq_path':       value => '/usr/bin/mailq.postfix';
      }
    }
    default: {}
  }

  mailalias {"root":
  mailalias {'root':
    recipient => $root_mail_recipient,
    notify    => Exec["newaliases"],
    notify    => Exec['newaliases'],
  }
}
+7 −7
Changes for manifests/ldap.pp: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
class postfix::ldap inherits postfix {
  Postfix::Config["alias_maps"] {
    value => "'hash:/etc/aliases, ldap:/etc/postfix/ldap-aliases.cf'",
  Postfix::Config['alias_maps'] {
    value => '"hash:/etc/aliases, ldap:/etc/postfix/ldap-aliases.cf"',
  }

  package {"postfix-ldap": }
  package {'postfix-ldap': }

  if ! $postfix_ldap_base {
  if ! $::postfix_ldap_base {
    fail 'Missing $postfix_ldap_base !'
  }

  file {"/etc/postfix/ldap-aliases.cf":
  file {'/etc/postfix/ldap-aliases.cf':
    ensure  => present,
    owner   => root,
    group   => postfix,
    content => template("postfix/postfix-ldap-aliases.cf.erb"),
    require => Package["postfix-ldap"],
    content => template('postfix/postfix-ldap-aliases.cf.erb'),
    require => Package['postfix-ldap'],
  }
}
+11 −8
Changes for manifests/mailman.pp: 11 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -5,30 +5,33 @@
# manager.
#
# Parameters:
# - every global variable which works for class "postfix" will work here.
# - every global variable which works for class 'postfix' will work here.
#
# Example usage:
#
#   node "toto.example.com" {
#   node 'toto.example.com' {
#     include mailman
#     include postfix::mailman
#   }
#
class postfix::mailman {
  $postfix_smtp_listen = "0.0.0.0"
  $postfix_smtp_listen = '0.0.0.0'
  include postfix

  postfix::config {
    "virtual_alias_maps":                   value => "hash:/etc/postfix/virtual";
    "transport_maps":                       value => "hash:/etc/postfix/transport";
    "mailman_destination_recipient_limit":  value => "1";
    'virtual_alias_maps':
      value => 'hash:/etc/postfix/virtual';
    'transport_maps':
      value => 'hash:/etc/postfix/transport';
    'mailman_destination_recipient_limit':
      value => '1';
  }

  postfix::hash { "/etc/postfix/virtual":
  postfix::hash { '/etc/postfix/virtual':
    ensure => present,
  }

  postfix::hash { "/etc/postfix/transport":
  postfix::hash { '/etc/postfix/transport':
    ensure => present,
  }

Loading