diff options
| author | Ahmed Abdelhalim <[email protected]> | 2025-09-02 01:30:46 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2025-09-02 01:30:46 +0200 |
| commit | 744d2521ffc1c68fc0328731275c9fc7751f366d (patch) | |
| tree | 59c829910a6eda6019d8302cb09bbe6604057e55 /roles/network | |
| parent | 17f10052bdbc4cf5bfd0e2fa335f13c0165284a5 (diff) | |
Fix pihole and network manger DNS when VPN isn't active
Diffstat (limited to 'roles/network')
| -rw-r--r-- | roles/network/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/network/templates/eth0-connection.nmconnection.j2 | 4 | ||||
| -rw-r--r-- | roles/network/templates/wifi-connection.nmconnection.j2 | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 5c733a48..3803c496 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -10,18 +10,16 @@ that: - network_ipv4_address is defined - network_ipv4_gateway is defined - - network_ipv4_dns is defined - fail_msg: "network_ipv4_address, network_ipv4_gateway, and network_ipv4_dns are required together" - when: network_ipv4_address is defined or network_ipv4_gateway is defined or network_ipv4_dns is defined + fail_msg: "network_ipv4_address and network_ipv4_gateway are required together" + when: network_ipv4_address is defined or network_ipv4_gateway is defined - name: "Validate network_ipv6_* params" ansible.builtin.assert: that: - network_ipv6_address is defined - network_ipv6_gateway is defined - - network_ipv6_dns is defined - fail_msg: "network_ipv6_address, network_ipv6_gateway, and network_ipv6_dns are required together" - when: network_ipv6_address is defined or network_ipv6_gateway is defined or network_ipv6_dns is defined + fail_msg: "network_ipv6_address and network_ipv6_gateway are required together" + when: network_ipv6_address is defined or network_ipv6_gateway is defined - name: "Ensure network enabled services are enabled" become: true diff --git a/roles/network/templates/eth0-connection.nmconnection.j2 b/roles/network/templates/eth0-connection.nmconnection.j2 index dab5a6de..493afdf7 100644 --- a/roles/network/templates/eth0-connection.nmconnection.j2 +++ b/roles/network/templates/eth0-connection.nmconnection.j2 @@ -10,7 +10,9 @@ autoconnect=true method=manual addresses={{ network_ipv4_address }} gateway={{ network_ipv4_gateway }} +{% if network_ipv4_dns is defined %} dns={{ network_ipv4_dns }} +{% endif %} {% else %} method=auto {% endif %} @@ -21,7 +23,9 @@ addr-gen-mode=default method=manual addresses={{ network_ipv6_address }} gateway={{ network_ipv6_gateway }} +{% if network_ipv6_dns is defined %} dns={{ network_ipv6_dns }} +{% endif %} {% else %} method=auto {% endif %} diff --git a/roles/network/templates/wifi-connection.nmconnection.j2 b/roles/network/templates/wifi-connection.nmconnection.j2 index c04077c0..0fd69cb1 100644 --- a/roles/network/templates/wifi-connection.nmconnection.j2 +++ b/roles/network/templates/wifi-connection.nmconnection.j2 @@ -18,7 +18,9 @@ psk={{ network_wifi_pass }} method=manual addresses={{ network_ipv4_address }} gateway={{ network_ipv4_gateway }} +{% if network_ipv4_dns is defined %} dns={{ network_ipv4_dns }} +{% endif %} {% else %} method=auto {% endif %} @@ -29,7 +31,9 @@ addr-gen-mode=default method=manual addresses={{ network_ipv6_address }} gateway={{ network_ipv6_gateway }} +{% if network_ipv6_dns is defined %} dns={{ network_ipv6_dns }} +{% endif %} {% else %} method=auto {% endif %} |