From 9129cb37779ddf0c80eba7fe0446c1f609b8d77a Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Fri, 30 May 2025 20:41:35 +0200 Subject: [PATCH] Use random MAC for wifi connections --- host_vars/xps/network.yml | 1 - tasks/network.yml | 24 +++++++++++++++---- templates/personal/xps/iwd.j2 | 4 ++++ .../xps/network/wlan0-frans.network.j2 | 2 +- .../xps/network/wlan0-local.network.j2 | 2 +- templates/personal/xps/network/wlan0.link.j2 | 7 ------ .../personal/xps/network/wlan0.network.j2 | 2 +- 7 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 templates/personal/xps/iwd.j2 delete mode 100644 templates/personal/xps/network/wlan0.link.j2 diff --git a/host_vars/xps/network.yml b/host_vars/xps/network.yml index 3fd2f25..9150f86 100644 --- a/host_vars/xps/network.yml +++ b/host_vars/xps/network.yml @@ -1,5 +1,4 @@ wireless_interface: wlan0 -wireless_interface_mac: 98:2c:bc:e3:ff:bc local_network_ssid: KPNAE51C6 local_network_address: 192.168.2.9/24 diff --git a/tasks/network.yml b/tasks/network.yml index 1c44670..0e35a82 100644 --- a/tasks/network.yml +++ b/tasks/network.yml @@ -76,9 +76,6 @@ group: systemd-network mode: '0640' loop: - - src: 'templates/personal/xps/network/wlan0.link.j2' - dest: '/etc/systemd/network/10-wlan0.link' - - src: 'templates/personal/xps/network/wlan0-local.network.j2' dest: '/etc/systemd/network/10-wireless.network' @@ -88,11 +85,28 @@ - src: 'templates/personal/xps/network/wlan0.network.j2' dest: '/etc/systemd/network/20-wireless.network' + - name: Create iwd directory + become: true + ansible.builtin.template: + src: templates/personal/xps/iwd.j2 + dest: /etc/iwd + mode: '0644' + owner: root + + - name: Provision iwd configuration + become: true + ansible.builtin.template: + src: templates/personal/xps/iwd.j2 + dest: /etc/iwd/main.config + mode: '0755' + owner: root + - name: Remove leftover configuration files become: true ansible.builtin.file: path: '{{ item }}' state: absent loop: - - '/etc/systemd/network/30-vmbr0.network' - - '/etc/systemd/network/30-vmbr0.netdev' + - /etc/systemd/network/30-vmbr0.network + - /etc/systemd/network/30-vmbr0.netdev + - /etc/systemd/network/10-wlan0.link diff --git a/templates/personal/xps/iwd.j2 b/templates/personal/xps/iwd.j2 new file mode 100644 index 0000000..ece78b8 --- /dev/null +++ b/templates/personal/xps/iwd.j2 @@ -0,0 +1,4 @@ +# {{ ansible_managed }} + +[General] +AddressRandomization=network diff --git a/templates/personal/xps/network/wlan0-frans.network.j2 b/templates/personal/xps/network/wlan0-frans.network.j2 index 522ddc3..7790429 100644 --- a/templates/personal/xps/network/wlan0-frans.network.j2 +++ b/templates/personal/xps/network/wlan0-frans.network.j2 @@ -1,7 +1,7 @@ # {{ ansible_managed }} [Match] -MACAddress={{ wireless_interface_mac }} +Name={{ wireless_interface }} SSID={{ frans_network_ssid }} [Network] diff --git a/templates/personal/xps/network/wlan0-local.network.j2 b/templates/personal/xps/network/wlan0-local.network.j2 index 3d23390..1a67fce 100644 --- a/templates/personal/xps/network/wlan0-local.network.j2 +++ b/templates/personal/xps/network/wlan0-local.network.j2 @@ -1,7 +1,7 @@ # {{ ansible_managed }} [Match] -MACAddress={{ wireless_interface_mac }} +Name={{ wireless_interface }} SSID={{ local_network_ssid }} [Network] diff --git a/templates/personal/xps/network/wlan0.link.j2 b/templates/personal/xps/network/wlan0.link.j2 deleted file mode 100644 index 429ab10..0000000 --- a/templates/personal/xps/network/wlan0.link.j2 +++ /dev/null @@ -1,7 +0,0 @@ -# {{ ansible_managed }} - -[Match] -MACAddress={{ wireless_interface_mac }} - -[Link] -Name={{ wireless_interface }} diff --git a/templates/personal/xps/network/wlan0.network.j2 b/templates/personal/xps/network/wlan0.network.j2 index ed8191f..4def9c6 100644 --- a/templates/personal/xps/network/wlan0.network.j2 +++ b/templates/personal/xps/network/wlan0.network.j2 @@ -1,5 +1,5 @@ [Match] -MACAddress={{ wireless_interface_mac }} +Name={{ wireless_interface }} [Network] DNS={{ default_network_dns }}