diff options
author | elijah <elijah@riseup.net> | 2015-09-11 10:35:09 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-09-11 10:35:09 -0700 |
commit | 12f94bca6b7b33b2a83883df9434adb6f290e757 (patch) | |
tree | 311eeeffda6658c0f723d7021200c05a1e926e7f /puppet/modules/site_postfix/manifests/mx/static_aliases.pp | |
parent | c0c06c6be819126cec6adb359a7e52c95f51defe (diff) | |
parent | 702bf139f407d60e7c297ceb67fc6c30fead1e61 (diff) |
Merge branch 'bugfix/mxaliases' into develop
Diffstat (limited to 'puppet/modules/site_postfix/manifests/mx/static_aliases.pp')
-rw-r--r-- | puppet/modules/site_postfix/manifests/mx/static_aliases.pp | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx/static_aliases.pp b/puppet/modules/site_postfix/manifests/mx/static_aliases.pp index 786d74c1..d81e05b3 100644 --- a/puppet/modules/site_postfix/manifests/mx/static_aliases.pp +++ b/puppet/modules/site_postfix/manifests/mx/static_aliases.pp @@ -30,29 +30,21 @@ class site_postfix::mx::static_aliases { } # - # Custom aliases. - # - # This does not use the puppet mailalias resource because we want to be able - # to guarantee the contents of the alias file. This is needed so if you - # remove an alias from the node's config, it will get removed from the alias - # file. - # - - # both alias files must be listed under "alias_database", because once you - # specify one, then `newaliases` no longer will default to updating - # "/etc/aliases.db". - postfix::config { - 'alias_database': - value => "/etc/aliases, /etc/postfix/custom-aliases"; - 'alias_maps': - value => "hash:/etc/aliases, hash:/etc/postfix/custom-aliases"; + # Custom static virtual aliases. + # + exec { 'postmap_virtual_aliases': + command => '/usr/sbin/postmap /etc/postfix/virtual-aliases', + refreshonly => true, + user => root, + group => root, + require => Package['postfix'], + subscribe => File['/etc/postfix/virtual-aliases'] } - - file { '/etc/postfix/custom-aliases': - content => template('site_postfix/custom-aliases.erb'), + file { '/etc/postfix/virtual-aliases': + content => template('site_postfix/virtual-aliases.erb'), owner => root, group => root, mode => 0600, - notify => Exec['newaliases'] + require => Package['postfix'] } } |