diff options
author | elijah <elijah@riseup.net> | 2015-10-05 09:48:29 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-10-05 09:48:29 -0700 |
commit | 133ba7d5af1659458996ef4f2d1cb8919b438394 (patch) | |
tree | 0bab77eee78d6d453e2c260fed6f2bdb137a567f /puppet/modules/site_postfix/templates | |
parent | da12768b873e17af261f7fd69aec7d86255fa6e5 (diff) | |
parent | afd8867ba953513c6e08f957e3099f0ff3b1a3a2 (diff) |
Merge branch 'bugfix/virtualaliases' into develop
Diffstat (limited to 'puppet/modules/site_postfix/templates')
-rw-r--r-- | puppet/modules/site_postfix/templates/virtual-aliases.erb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/site_postfix/templates/virtual-aliases.erb b/puppet/modules/site_postfix/templates/virtual-aliases.erb index c474e734..8373de97 100644 --- a/puppet/modules/site_postfix/templates/virtual-aliases.erb +++ b/puppet/modules/site_postfix/templates/virtual-aliases.erb @@ -1,8 +1,7 @@ # # This file is managed by puppet. # -# This is a map of custom, non-standard aliases. The contents of this file -# are derived from the node property `mx.aliases`. +# These virtual aliases take precedence over all other aliases. # # |