aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2024-04-08 20:37:12 +0000
committerPascal Terjan <pterjan@mageia.org>2024-04-09 14:28:03 +0000
commit26ad99919c71c7c2d7bc905d5fa2e2c3cd611683 (patch)
treeebd8c45dc10d3bfa3369ea2465161a8e752ebb39 /deployment
parent90d7b504d35768e7c7b9f26cd02befa1e36f6725 (diff)
downloadpuppet-26ad99919c71c7c2d7bc905d5fa2e2c3cd611683.tar
puppet-26ad99919c71c7c2d7bc905d5fa2e2c3cd611683.tar.gz
puppet-26ad99919c71c7c2d7bc905d5fa2e2c3cd611683.tar.bz2
puppet-26ad99919c71c7c2d7bc905d5fa2e2c3cd611683.tar.xz
puppet-26ad99919c71c7c2d7bc905d5fa2e2c3cd611683.zip
Try to allow sending emails from @machine.mageia.org
Diffstat (limited to 'deployment')
-rw-r--r--deployment/dns/templates/mageia.org.zone6
1 files changed, 5 insertions, 1 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index 5d8b5936..ff8e31b6 100644
--- a/deployment/dns/templates/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
@@ -7,7 +7,7 @@
; $Id$
$TTL 30m
@ IN SOA ns0.mageia.org. root.mageia.org. (
- 2024021901 ; Serial
+ 2024040801 ; Serial
7200 ; Refresh
3600 ; Retry
86400 ; Expire
@@ -37,12 +37,16 @@ group IN MX 20 neru.mageia.org.
<%-
nodes_txt = ''
nodes.keys.sort.each{|nodename|
+ spf = ''
if nodes[nodename].has_key?('ipv4')
nodes_txt += nodename + ' IN A ' + nodes[nodename]['ipv4'] + "\n"
+ spf += ' ip4:' + nodes[nodename]['ipv4']
end
if nodes[nodename].has_key?('ipv6')
nodes_txt += nodename + ' IN AAAA ' + nodes[nodename]['ipv6'] + "\n"
+ spf += ' ip6:' + nodes[nodename]['ipv6']
end
+ nodes_txt += nodename + ' IN TXT "v=spf1 ' + spf + ' mx:mageia.org ~all" ' + "\n"
}
-%>
<%= nodes_txt %>