From c45bccdaa12328ed93cbb96ca3c79cbdc0220771 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 10 Apr 2025 21:50:42 +0200 Subject: [PATCH] Include local network configuration for xps --- host_vars/xps/network.yml | 7 +++++++ tasks/network.yml | 6 +++++- .../personal/xps/network/wireless.network.j2 | 6 ------ .../personal/xps/network/wlan0-local.network.j2 | 15 +++++++++++++++ templates/personal/xps/network/wlan0.link.j2 | 7 +++++++ templates/personal/xps/network/wlan0.network.j2 | 6 ++++++ 6 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 host_vars/xps/network.yml delete mode 100644 templates/personal/xps/network/wireless.network.j2 create mode 100644 templates/personal/xps/network/wlan0-local.network.j2 create mode 100644 templates/personal/xps/network/wlan0.link.j2 create mode 100644 templates/personal/xps/network/wlan0.network.j2 diff --git a/host_vars/xps/network.yml b/host_vars/xps/network.yml new file mode 100644 index 0000000..03ad73b --- /dev/null +++ b/host_vars/xps/network.yml @@ -0,0 +1,7 @@ +wireless_interface: wlan0 +wireless_interface_mac: 98:2c:bc:e3:ff:bc + +local_network_ssid: KPNAE51C6 +local_network_address: 192.168.2.9/24 +local_network_dns: 192.168.2.254 +local_network_gateway: 192.168.2.254 diff --git a/tasks/network.yml b/tasks/network.yml index 26eea9c..0fdda79 100644 --- a/tasks/network.yml +++ b/tasks/network.yml @@ -62,7 +62,11 @@ group: systemd-network mode: '0640' loop: - - src: 'templates/personal/xps/network/wireless.network.j2' + - 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' + - src: 'templates/personal/xps/network/wlan0.network.j2' dest: '/etc/systemd/network/20-wireless.network' - name: Remove leftover configuration files diff --git a/templates/personal/xps/network/wireless.network.j2 b/templates/personal/xps/network/wireless.network.j2 deleted file mode 100644 index fe2fad1..0000000 --- a/templates/personal/xps/network/wireless.network.j2 +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=98:2c:bc:e3:ff:bc - -[Network] -DHCP=true -RequiredForOnline=true diff --git a/templates/personal/xps/network/wlan0-local.network.j2 b/templates/personal/xps/network/wlan0-local.network.j2 new file mode 100644 index 0000000..3a80188 --- /dev/null +++ b/templates/personal/xps/network/wlan0-local.network.j2 @@ -0,0 +1,15 @@ +# {{ ansible_managed }} + +[Match] +MACAddress={{ wireless_interface_mac }} +SSID={{ local_network_ssid }} + +[Network] +Address={{ local_network_address }} +DNS={{ local_network_dns }} +Gateway={{ local_network_gateway }} +DHCP=no +RequiredForOnline=yes + +[Link] +MulticastDNS=yes diff --git a/templates/personal/xps/network/wlan0.link.j2 b/templates/personal/xps/network/wlan0.link.j2 new file mode 100644 index 0000000..429ab10 --- /dev/null +++ b/templates/personal/xps/network/wlan0.link.j2 @@ -0,0 +1,7 @@ +# {{ 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 new file mode 100644 index 0000000..c4c7be2 --- /dev/null +++ b/templates/personal/xps/network/wlan0.network.j2 @@ -0,0 +1,6 @@ +[Match] +MACAddress={{ wireless_interface_mac }} + +[Network] +DHCP=yes +RequiredForOnline=yes