Unverified Commit a9551f4b authored by Kenyon Ralph's avatar Kenyon Ralph Committed by GitHub
Browse files

Merge pull request #454 from LeGmask/mailalias_file 

Add support for managing custom mailalias target
parents b17511fc 14d724df

REFERENCE.md

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ Default value: `"puppet:///modules/${module_name}/main.cf"` 


Data type: `Boolean`



Manage /etc/aliases file

Manage $alias_maps file



Default value: `true`

manifests/files.pp

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class postfix::files { 


  # Aliases

  if $manage_aliases {

    file { '/etc/aliases':

    file { regsubst($postfix::alias_maps, '^.*:', ''):

      ensure  => 'file',

      content => "# file managed by puppet\n",

      notify  => Exec['newaliases'],

manifests/init.pp

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
#   Example: `puppet:///modules/some/other/location/main.cf`.

#

# @param manage_aliases

#   Manage /etc/aliases file

#   Manage $alias_maps file

#

# @param manage_conffiles

#   A Boolean defining whether the puppet module should replace the configuration files for postfix.
@@ -284,7 +284,7 @@ class postfix ( 
  Boolean $mailman = false,

  String $mailx_ensure = 'present',

  String $maincf_source = "puppet:///modules/${module_name}/main.cf",

  Boolean $manage_aliases = true, # /etc/aliases

  Boolean $manage_aliases = true, # $alias_maps

  Boolean $manage_conffiles = true,

  Boolean $manage_mailname = true,

  Boolean $manage_mailx = true,

manifests/mailalias.pp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ define postfix::mailalias ( 
    ensure    => $ensure,

    name      => $name,

    recipient => $recipient,

    target    => regsubst($postfix::alias_maps, '^.*:', ''),

    notify    => Exec['newaliases'],

  }

}

manifests/service.pp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class postfix::service { 
      command     => 'newaliases',

      path        => $facts['path'],

      refreshonly => true,

      subscribe   => File['/etc/aliases'],

      subscribe   => File[regsubst($postfix::alias_maps, '^.*:', '')],

      require     => Service['postfix'],

    }

  }