feat: Create role

README.md

@@ -1,122 +1,3 @@
 # role_dnsmasq
 
-Ce rôle permet d'installer et configurer dnsmasq.
+Deploy dnsmasq.
-
-## Variables
-
-### dnsmasq_conf_domain
-
-Nom de domain utilisé pour qualifier les noms courts.
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
-
-### dnsmasq_conf_servers
-
-Liste d'adresses IP auxquelles les requêtes DNS sont transmises si dnsmasq ne porte pas le domaine.
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
-
-### dnsmasq_servers
-
-Liste d'IP ou de noms d'hôtes servant de serveur DNS.
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
-
-### dnsmasq_host_ips
-
-Liste des IP de l'hôte.
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
-
-### dnsmasq_host_aliases
-
-Liste d'alias pour un hôte (*host_groups*).
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
-
-### dnsmasq_client_filename
-
-Nom du fichier pour le client.
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> `{{ inventory_hostname }}`*
-
-### dnsmasq_client_hostname
-
-Nom d'hôte du client.
-
-*<span style="text-decoration: underline">Valeur par défaut:</span> `{{ inventory_hostname }} {{ inventory_hostname_short }}`*
-
-## Exemple d'utilisation
-
-### inventory.yml
-
-```yaml
----
-
-all:
-  hosts:
-    host1.ykn.local:
-    host2.ykn.local:
-  children:
-    dnsservers:
-      hosts:
-        dnsmasq1.ykn.local:
-        dnsmasq2.ykn.local:
-```
-
-### group_vars/all.yml
-
-```yaml
----
-
-dnsmasq_servers: "{{ groups['dnsservers'] }}"
-```
-
-
-### group_vars/dnsservers.yml
-
-```yaml
----
-
-dnsmasq_conf_domain: ykn.local
-dnsmasq_conf_servers:
-  - 127.0.0.1#53000
-  - ::1#53000
-```
-
-### host_vars/host1.ykn.local.yml
-
-```yaml
----
-
-dnsmasq_host_ipv4: [192.168.50.6]
-dnsmasq_host_ipv6: [fd00:ff50::d006]
-
-dnsmasq_host_alias:
-  - monsuperhost1.ykn.local
-  - monsuperhost1
-  - toto.ykn.local
-  - toto
-```
-
-### playbook.yml
-
-```yaml
----
-
-- name: Déployer les serveurs DNS
-  hosts: dnsservers
-  roles:
-    - name: stubby
-    - name: dnsmasq
-    - name: nftables
-
-- name: Gérer l'enregistrement DNS
-  hosts: 'all:!dnsservers'
-  gather_facts: false
-  tasks:
-    - name: Inclure le rôle
-      ansible.builtin.include_role:
-        name: dnsmasq
-        tasks_from: client
-```

defaults/main.yml

@@ -1,13 +1,36 @@
 ---
 # defaults file for dnsmasq
 
-dnsmasq_conf_domain: ""
+# Directory to deploy override conf of systemd-resolved
-dnsmasq_conf_servers: []
+dnsmasq_resolved_directory: /etc/systemd/resolved.conf.d
 
+# Directory to deploy configuration
+dnsmasq_conf_directory: /etc/dnsmasq.d
+
+# Directory to deploy records files
+dnsmasq_records_directory: "{{ dnsmasq_conf_directory }}/records"
+
+# Configuration
+dnsmasq_interface: "{{ ansible_facts['default_ipv4']['interface'] }}"
+dnsmasq_domain: ""
 dnsmasq_servers: []
+dnsmasq_rev_servers: []
+dnsmasq_bogus_priv_enabled: true
+dnsmasq_rebind_domains: []
+
+dnsmasq_hosts: []
 
 dnsmasq_host_ips: []
 dnsmasq_host_aliases: []
 
 dnsmasq_client_filename: "{{ inventory_hostname }}"
 dnsmasq_client_hostname: "{{ inventory_hostname }} {{ inventory_hostname_short }}"
+
+# Ansible group automatically used in records file
+dnsmasq_ansible_group: ""
+
+# IPv6 subnet
+dnsmasq_ipv6_subnet: ""
+
+# Specific records
+dnsmasq_specifics: []

handlers/main.yml

@@ -1,18 +1,32 @@
 ---
 # handlers file for dnsmasq
 
-- name: Recharger dnsmasq.service
+- name: Apply installation
+  ansible.builtin.command:
+    argv:
+      - /usr/bin/rpm-ostree
+      - apply-live
   become: true
-  ansible.builtin.systemd:
-    state: reloaded
-    name: dnsmasq.service
 
-- name: Recharger dnsmasq.service sur les serveurs
+- name: Restart systemd-resolved.service
+  ansible.builtin.systemd_service:
+    name: systemd-resolved.service
+    state: restarted
   become: true
-  ansible.builtin.systemd:
+
-    state: reloaded
+- name: Restart dnsmasq.service
+  ansible.builtin.systemd_service:
     name: dnsmasq.service
-  loop: "{{ dnsmasq_servers }}"
+    state: restarted
-  loop_control:
+  become: true
-    loop_var: dnsserver
+  register: dnsmasq_restarted
-  delegate_to: "{{ dnsserver }}"
+
+- name: Restart dnsmasq.service on dns servers
+  ansible.builtin.systemd_service:
+    name: dnsmasq.service
+    state: restarted
+  when: dnsmasq_restarted is undefined
+  become: true
+  loop: "{{ dnsmasq_hosts }}"
+  delegate_to: "{{ item }}"
+  run_once: true

meta/main.yml

@@ -1,7 +1,7 @@
 galaxy_info:
   namespace: ykn
   author: pulsar89.5
-  description: Rôle de déploiement de dnsmasq
+  description: Deploy dnsmasq
 
   license: GPL-3.0-or-later
 

tasks/client.yml

@@ -1,35 +0,0 @@
----
-# tasks file for security
-
-- name: Déployer le fichier lié à l'hôte
-  ansible.builtin.template:
-    owner: dnsmasq
-    group: root
-    mode: u=rw,g=r,o=r
-    src: "{{ role_path }}/templates/host.conf.j2"
-    dest: /srv/dnsmasq/{{ dnsmasq_client_filename }}.conf
-  when:
-    - dnsmasq_servers | length > 0
-    - dnsmasq_host_ipv4 not in dnsmasq_servers
-  tags: creation
-  loop: "{{ dnsmasq_servers }}"
-  loop_control:
-    loop_var: dnsserver
-  delegate_to: "{{ dnsserver }}"
-  become: true
-  notify: Recharger dnsmasq.service sur les serveurs
-
-- name: Supprimer le fichier lié à l'hôte
-  ansible.builtin.file:
-    path: /srv/dnsmasq/{{ dnsmasq_client_filename }}.conf
-    state: absent
-  when:
-    - dnsmasq_servers | length > 0
-    - dnsmasq_host_ipv4 not in dnsmasq_servers
-  tags: [destruction, never]
-  loop: "{{ dnsmasq_servers }}"
-  loop_control:
-    loop_var: dnsserver
-  delegate_to: "{{ dnsserver }}"
-  become: true
-  notify: Recharger dnsmasq.service sur les serveurs

tasks/configuration.yml

@@ -1,22 +1,61 @@
 ---
-# tasks file for security
+# tasks file for dnsmasq
 
-- name: Configurer dnsmasq
+- name: Create path to override systemd-resolved
+  ansible.builtin.file:
+    path: "{{ dnsmasq_resolved_directory }}"
+    state: directory
+    owner: root
+    group: root
+    mode: u=rwX,g=rX,o=rX
+  become: true
+  notify: Restart systemd-resolved.service
+
+- name: Disable stub resolver of systemd-resolved
   ansible.builtin.template:
-    src: dnsmasq.conf.j2
+    src: stub-listener.conf.j2
-    dest: /etc/dnsmasq.d/cache.conf
+    dest: "{{ dnsmasq_resolved_directory }}/stub-listener.conf"
     owner: root
     group: root
     mode: u=rw,g=r,o=r
   become: true
-  notify: Recharger dnsmasq.service
+  notify: Restart systemd-resolved.service
 
-- name: Déployer la configuration de l'instance
+- name: Flush handlers
+  meta: flush_handlers
+
+- name: Create records directory
+  ansible.builtin.file:
+    path: "{{ dnsmasq_records_directory }}"
+    state: directory
+    owner: dnsmasq
+    group: root
+    mode: u=rwX,g=rX,o=rX
+  become: true
+
+- name: Remove old configuration
+  ansible.builtin.file:
+    path: "{{ dnsmasq_conf_directory }}/cache.conf"
+    state: absent
+  become: true
+
+- name: Deploy configuration
   ansible.builtin.template:
+    src: dnsmasq.conf.j2
+    dest: "{{ dnsmasq_conf_directory }}/dns.conf"
+    owner: root
+    group: root
+    mode: u=rw,g=r,o=r
+  become: true
+  notify: Restart dnsmasq.service
+
+- name: Deploy specific records
+  ansible.builtin.template:
+    src: "{{ role_path }}/templates/records_specific.conf.j2"
+    dest: "{{ dnsmasq_records_directory }}/specific.conf"
     owner: dnsmasq
     group: root
     mode: u=rw,g=r,o=r
-    src: host.conf.j2
+  when: dnsmasq_specifics | length > 0
-    dest: /srv/dnsmasq/{{ inventory_hostname }}.conf
   become: true
-  notify: Recharger dnsmasq.service
+  notify: Restart dnsmasq.service

tasks/installation.yml

@@ -1,16 +1,32 @@
 ---
 # tasks file for dnsmasq
 
-- name: Installer dnsmasq
+- name: Install dnsmasq
-  become: true
   ansible.builtin.package:
     name: dnsmasq
-
+  when: ansible_facts['pkg_mgr'] == "apt"
-- name: Créer le dossier dédié à dnsmasq
+  become: true
-  ansible.builtin.file:
+
-    path: /srv/dnsmasq
+- name: Install dnsmasq
-    state: directory
+  ansible.builtin.command:
-    owner: dnsmasq
+    argv:
-    group: root
+      - /usr/bin/rpm-ostree
-    mode: u=rwX,g=rX,o=rX
+      - install
+      - --allow-inactive
+      - --assumeyes
+      - --idempotent
+      - dnsmasq
+    creates: /usr/sbin/dnsmasq
+  when: ansible_facts['pkg_mgr'] == "atomic_container"
+  become: true
+  notify: Apply installation
+
+- name: Flush handlers
+  meta: flush_handlers
+
+- name: Enable dnsmasq.service
+  ansible.builtin.systemd_service:
+    name: dnsmasq.service
+    masked: false
+    enabled: true
   become: true

tasks/main.yml

@@ -1,10 +1,14 @@
 ---
 # tasks file for dnsmasq
 
-- name: Importer les tâches d'installation
+- name: Include installation tasks
-  tags: installation
+  ansible.builtin.include_tasks:
-  ansible.builtin.import_tasks: installation.yml
+    file: installation.yml
 
-- name: Importer les tâches de configuration
+- name: Import configuration tasks
-  tags: configuration
+  ansible.builtin.import_tasks:
-  ansible.builtin.import_tasks: configuration.yml
+    file: configuration.yml
+
+- name: Import records deployment tasks
+  ansible.builtin.import_tasks:
+    file: records.yml

tasks/records.yml

@@ -0,0 +1,18 @@
+---
+# tasks file for security
+
+- name: Deploy records from ansible group
+  ansible.builtin.template:
+    src: "{{ role_path }}/templates/records_auto.conf.j2"
+    dest: "{{ dnsmasq_records_directory }}/auto-{{ dnsmasq_ansible_group }}.conf"
+    owner: dnsmasq
+    group: root
+    mode: u=rw,g=r,o=r
+  when: dnsmasq_hosts | length > 0
+  become: true
+  delegate_to: "{{ dnsserver }}"
+  loop: "{{ dnsmasq_hosts }}"
+  loop_control:
+    loop_var: dnsserver
+  run_once: true
+  notify: Restart dnsmasq.service on dns servers

templates/dnsmasq.conf.j2

@@ -1,40 +1,50 @@
 # {{ ansible_managed }}
 
-# Ne pas transmettre les requêtes avec un nom court (pas FQDN)
+# Listen only on the specified interface(s)
+interface={{ dnsmasq_interface }}
+
+# Tells dnsmasq to never forward A or AAAA queries for plain names
 domain-needed
 
-# Ne pas envoyer les requête sur les IP privées
+# Specifies DNS domains
-bogus-priv
+domain={{ dnsmasq_domain }}
+local=/{{ dnsmasq_domain }}/
 
-# Spécifié le domaine pour qualifié les noms courts
+# Add the domain to simple names
-domain={{ dnsmasq_conf_domain }}
-local=/{{ dnsmasq_conf_domain }}/
-
-# Ajoute le nom de domaine au noms simples
 expand-hosts
 
-# Ne pas mettre en cache les requêtes n'aboutissant pas
+# Disable negative caching
 no-negcache
 
-# Ne pas utiliser /etc/resolv.conf
+# Don't read /etc/resolv.conf
 no-resolv
 
-# Ne pas utiliser /etc/hosts
+# Don't read the hostnames in /etc/hosts
 no-hosts
 
-# Utiliser dnscrypt-proxy
+# Specify upstream servers directly
-{% for server in dnsmasq_conf_servers %}
+{% for server in dnsmasq_servers %}
 server={{ server }}
 {% endfor %}
 
-# Bloquer le rebond DNS
+# Specify upstream servers directly (PTR)
+{% for server in dnsmasq_rev_servers %}
+rev-server={{ server }}
+{% endfor %}
+
+# Do not detect and block dns-rebind on queries to these domains
+{% for domain in dnsmasq_rebind_domains %}
+rebind-domain-ok=/{{ domain }}/
+{% endfor %}
+
+# Reject (and log) addresses from upstream nameservers which are in the private ranges
 stop-dns-rebind
 
-# Autoriser le rebond sur localhost
+# Exempt 127.0.0.0/8 and ::1 from rebinding checks
 rebind-localhost-ok
 
-# Taille du cache DNS
+# Set the size of dnsmasq's cache
-cache-size=1024
+cache-size=4096
 
-# Définir le fichier des entrées personnalisées
+# Additional hosts file. Read the specified file as well as /etc/hosts
-addn-hosts=/srv/dnsmasq
+addn-hosts={{ dnsmasq_records_directory }}

templates/host.conf.j2

@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-
-{% for ip in dnsmasq_host_ips %}
-{{ ip }}  {{ dnsmasq_client_hostname }} {{ dnsmasq_host_aliases | join(' ') }}
-{% endfor %}

templates/records_auto.conf.j2

@@ -0,0 +1,12 @@
+# {{ ansible_managed }}
+
+{%- for host in groups[dnsmasq_ansible_group] | sort %}
+{%- set ipv4 = hostvars[host]['ansible_host'] %}
+{%- set ipv6_prefix = dnsmasq_ipv6_subnet | split('/') | first %}
+{%- set ipv6_suffix = hostvars[host]['ansible_host'] | split('.') | last %}
+{%- set aliases = [host] + hostvars[host].get('dnsmasq_host_aliases', []) %}
+
+## {{ host }}
+{{ ipv4 }} {{ aliases | join(' ') }}
+{{ ipv6_prefix }}{{ ipv6_suffix }} {{ aliases | join(' ') }}
+{% endfor %}

templates/records_specific.conf.j2

@@ -0,0 +1,10 @@
+# {{ ansible_managed }}
+
+{%- for specific in dnsmasq_specifics %}
+{%- set aliases = specific.aliases | default([]) %}
+
+## {{ specific.hostname }}
+{% for ip in specific.ips %}
+{{ ip }} {{ ([specific.hostname] + aliases) | join(' ') }}
+{% endfor %}
+{% endfor %}

templates/stub-listener.conf.j2

@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+
+[Resolve]
+DNSStubListener=no