aboutsummaryrefslogtreecommitdiffstats
path: root/modules/postfix/templates/virtual_aliases
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-06-11 22:26:26 +0000
committerColin Guthrie <colin@mageia.org>2014-06-11 22:26:26 +0000
commitc55dc7cfcfc1a56848b85f9b1a62c1e9091a3bd8 (patch)
treefd7621e7f6a50c72982290f9dec565e649c3ee7b /modules/postfix/templates/virtual_aliases
parent9ed3bb27be0029c0c975e1eb06c8c124585f8735 (diff)
downloadpuppet-c55dc7cfcfc1a56848b85f9b1a62c1e9091a3bd8.tar
puppet-c55dc7cfcfc1a56848b85f9b1a62c1e9091a3bd8.tar.gz
puppet-c55dc7cfcfc1a56848b85f9b1a62c1e9091a3bd8.tar.bz2
puppet-c55dc7cfcfc1a56848b85f9b1a62c1e9091a3bd8.tar.xz
puppet-c55dc7cfcfc1a56848b85f9b1a62c1e9091a3bd8.zip
postfix: Use domain variable (not that we're going to change name anytime soon)
Diffstat (limited to 'modules/postfix/templates/virtual_aliases')
-rw-r--r--modules/postfix/templates/virtual_aliases14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/postfix/templates/virtual_aliases b/modules/postfix/templates/virtual_aliases
index 2ffab07e..06b278e7 100644
--- a/modules/postfix/templates/virtual_aliases
+++ b/modules/postfix/templates/virtual_aliases
@@ -5,8 +5,8 @@ treasurer@<%= domain %> treasurer@group.<%= domain %>
president@<%= domain %> ennael@<%= domain %>
secretary@<%= domain %> obgr_seneca@<%= domain %>
-contact@<%= domain %> council@group.mageia.org
-press@<%= domain %> council@group.mageia.org
+contact@<%= domain %> council@group.<%= domain %>
+press@<%= domain %> council@group.<%= domain %>
# later switch to a team alias
root@<%= domain %> sysadmin@group.<%= domain %>
@@ -14,11 +14,11 @@ root@<%= domain %> sysadmin@group.<%= domain %>
security@<%= domain %> security@group.<%= domain %>
# Alias for old mailing list addresses
-mageia-dev@mageia.org dev@ml.mageia.org
-mageia-discuss@mageia.org discuss@ml.mageia.org
-mageia-sysadm@mageia.org sysadmin-discuss@ml.mageia.org
-mageia-i18n@mageia.org i18n-discuss@ml.mageia.org
-mageia-bugsquad@mageia.org bugsquad-discuss@ml.mageia.org
+mageia-dev@<%= domain %> dev@ml.<%= domain %>
+mageia-discuss@<%= domain %> discuss@ml.<%= domain %>
+mageia-sysadm@<%= domain %> sysadmin-discuss@ml.<%= domain %>
+mageia-i18n@<%= domain %> i18n-discuss@ml.<%= domain %>
+mageia-bugsquad@<%= domain %> bugsquad-discuss@ml.<%= domain %>
# TODO see http://www.ietf.org/rfc/rfc2142.txt
<%