From f106838dc1eedc1269299f7a9ba49a466e0c9b6d Mon Sep 17 00:00:00 2001 From: Beta Date: Tue, 25 Nov 2025 14:04:05 -0300 Subject: [PATCH 1/2] dns_extras en archivos con nombres de dominio principal, en roles/knsupdate/files/dns_extras --- roles/knsupdate/files/dns_extras/pilmaiken.abyaya.la | 8 ++++++++ roles/knsupdate/tasks/templates/commands.j2 | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 roles/knsupdate/files/dns_extras/pilmaiken.abyaya.la diff --git a/roles/knsupdate/files/dns_extras/pilmaiken.abyaya.la b/roles/knsupdate/files/dns_extras/pilmaiken.abyaya.la new file mode 100644 index 0000000..50f3357 --- /dev/null +++ b/roles/knsupdate/files/dns_extras/pilmaiken.abyaya.la @@ -0,0 +1,8 @@ +del pilmaiken mx +del pilmaiken txt +del pilmaiken spf +add pilmaiken mx 10 correspondencia.latina.red. +add pilmaiken txt "v=spf1 mx a:correspondencia.latina.red -all" +add pilmaiken spf "v=spf1 mx a:correspondencia.latina.red -all" +add dkim._domainkey.pilmaiken txt "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDQ6JwPaawDzMXuscSgDpvipRFLGXSqgmvvI6jk18lcg0kK2lfxsvXGJ/6U7oCtKa35IEVzdigxD0o7DzklKxAsNIVbcExPJkFWzQuKuP6ATBESo7YUn7Z5qjfxBiNPS0FJp8XpbpUzN+zg/NTgmkggnwwC0tKgcEQ6HnI9AOa1LQIDAQAB" +add _dmarc.pilmaiken txt "v=DMARC1; p=reject; rua=mailto:postmaster@correspondencia.latina.red; ruf=mailto:postmaster@correspondencia.latina.red; adkim=s; aspf=s" diff --git a/roles/knsupdate/tasks/templates/commands.j2 b/roles/knsupdate/tasks/templates/commands.j2 index 45438b5..39e9b2a 100644 --- a/roles/knsupdate/tasks/templates/commands.j2 +++ b/roles/knsupdate/tasks/templates/commands.j2 @@ -1,19 +1,23 @@ {% for dns_server in dns_servers %} + server {{ dns_server }} zone abyaya.la. origin abyaya.la. ttl 60 + del {{ vho }} a del {{ vho }} ns + add {{ vho }} a {{ host_ip }} add *.{{ vho }} a {{ host_ip }} + add _acme-challenge.{{ vho }} a {{ host_ip }} add _acme-challenge.{{ vho }} ns _acme-challenge -{% if vhost.dns_extras is defined %} -{% for dns_extra in vhost.dns_extras %} + +{% for dns_extra in (lookup('file', 'files/dns_extras/'+vhost.domains[0], errors='ignore') | default('', true)).splitlines() %} {{ dns_extra }} {% endfor %} -{% endif %} + send {% endfor %} quit -- 2.49.0 From 1b69f0d13fde873a1059ca9dc9cca773947bf2e3 Mon Sep 17 00:00:00 2001 From: Beta Date: Mon, 1 Dec 2025 15:08:07 -0300 Subject: [PATCH 2/2] simplifico sintaxis con include --- roles/knsupdate/tasks/templates/commands.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/knsupdate/tasks/templates/commands.j2 b/roles/knsupdate/tasks/templates/commands.j2 index 39e9b2a..9425130 100644 --- a/roles/knsupdate/tasks/templates/commands.j2 +++ b/roles/knsupdate/tasks/templates/commands.j2 @@ -14,9 +14,7 @@ add *.{{ vho }} a {{ host_ip }} add _acme-challenge.{{ vho }} a {{ host_ip }} add _acme-challenge.{{ vho }} ns _acme-challenge -{% for dns_extra in (lookup('file', 'files/dns_extras/'+vhost.domains[0], errors='ignore') | default('', true)).splitlines() %} -{{ dns_extra }} -{% endfor %} +{% include "files/dns_extras/" ~ vhost.domains[0] ignore missing %} send {% endfor %} -- 2.49.0