summaryrefslogtreecommitdiffstats
path: root/roles/network/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'roles/network/tasks')
-rw-r--r--roles/network/tasks/install-debian.yml18
-rw-r--r--roles/network/tasks/main.yml11
2 files changed, 26 insertions, 3 deletions
diff --git a/roles/network/tasks/install-debian.yml b/roles/network/tasks/install-debian.yml
index 7263bc84..74c527d5 100644
--- a/roles/network/tasks/install-debian.yml
+++ b/roles/network/tasks/install-debian.yml
@@ -11,11 +11,12 @@
ansible.builtin.set_fact:
network_default_services:
- "dhcpcd"
+ - "avahi-daemon"
- "networking"
- "wpa_supplicant"
tags: [required_for_boot]
-- name: "Disable conflicting services"
+- name: "Stop/Disable conflicting services"
become: true
ansible.builtin.systemd_service:
name: "{{ item }}"
@@ -23,7 +24,9 @@
state: "stopped"
with_items: "{{ network_default_services }}"
when: not ansible_is_chroot
- tags: [required_for_boot]
+ failed_when: false
+ # Not required for boot
+ tags: []
- name: "(chroot): Disable conflicting services"
ansible.builtin.command:
@@ -32,3 +35,14 @@
when: ansible_is_chroot
# noqa: command-instead-of-module module doesn't work inside chroot
tags: [required_for_boot]
+
+- name: "Ensure avahi packages are removed"
+ become: true
+ ansible.builtin.apt:
+ pkg:
+ - "avahi-daemon"
+ - "avahi-utils"
+ state: "absent"
+ autoremove: true
+ purge: true
+ tags: [required_for_boot]
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index e8bca0be..cb8f1fd9 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -22,6 +22,7 @@
ff02::2 ip6-allrouters
when: hostname is defined
# Not required for boot
+ tags: []
- name: "Include OS-specific variables"
ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml"
@@ -44,9 +45,17 @@
become: true
tags: [required_for_boot]
notify:
- - "Restart network services"
- "Reload systemd"
+ - "Restart NetworkManager"
+ - "Restart systemd-networkd"
+ - "Restart systemd-resolved"
block:
+ - name: "Configure systemd-resolved"
+ ansible.builtin.template:
+ src: "resolved.conf.j2"
+ dest: "/etc/systemd/resolved.conf"
+ mode: "0644"
+
- name: "Configure NetworkManager"
ansible.builtin.template:
src: "NetworkManager.conf.j2"