From ed9eb28dfba732facfd379e63d38c726cb85c178 Mon Sep 17 00:00:00 2001 From: "pulsar89.5" Date: Fri, 28 Feb 2025 10:27:13 +0100 Subject: [PATCH] feat: Add new variable for ipv6 subnet --- defaults/main.yml | 3 +++ templates/auto.conf.j2 | 9 ++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index eb318f3..4bb3e7e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -18,5 +18,8 @@ dnsmasq_client_hostname: "{{ inventory_hostname }} {{ inventory_hostname_short } # Groupe ansible pour l'enregistrement automatique dnsmasq_ansible_group: zone_gaia +# CIDR du sous-réseau IPv6 +dnsmasq_ipv6_subnet: "" + # Enregistrement spécifiques dnsmasq_specifics: [] diff --git a/templates/auto.conf.j2 b/templates/auto.conf.j2 index ec882c4..a770162 100644 --- a/templates/auto.conf.j2 +++ b/templates/auto.conf.j2 @@ -3,15 +3,10 @@ {% for host in groups[dnsmasq_ansible_group] %} {%- set ipv4 = hostvars[host]['ansible_host'] %} {%- set ipv6_suffix = hostvars[host]['ansible_host'] | split('.') | last %} +{%- set ipv6 = (dnsmasq_ipv6_subnet | split('/') | first) + ipv6_suffix %} {%- set aliases = [host] + hostvars[host].get('dnsmasq_host_aliases', []) %} # {{ host }} {{ ipv4 }} {{ aliases | join(' ') }} -{% if (ipv6_suffix | int) < 10 %} -2a01:e0a:ee5:8b0::d00{{ ipv6_suffix }} {{ aliases | join(' ') }} -{% elif (ipv6_suffix | int) < 100 %} -2a01:e0a:ee5:8b0::d0{{ ipv6_suffix }} {{ aliases | join(' ') }} -{% else %} -2a01:e0a:ee5:8b0::d{{ ipv6_suffix }} {{ aliases | join(' ') }} -{% endif %} +{{ ipv6 }} {{ aliases | join(' ') }} {% endfor %}