From ecd08fb7e89092fe89f944ef7c8f12c238b277aa Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Fri, 23 Apr 2021 12:20:17 +0100
Subject: [PATCH] networking: Remove support for specifying DNS servers
Redundant since this commit:
bdd538ec ("Use unbound for rspamd DNS resolving")
Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
host_vars/mail.archlinux.org/misc | 1 -
roles/networking/defaults/main.yml | 1 -
roles/networking/tasks/main.yml | 4 ----
roles/networking/templates/10-static-ethernet.network.j2 | 3 ---
4 files changed, 9 deletions(-)
diff --git a/host_vars/mail.archlinux.org/misc b/host_vars/mail.archlinux.org/misc
index b33a2e7e1..59af3f7a6 100644
--- a/host_vars/mail.archlinux.org/misc
+++ b/host_vars/mail.archlinux.org/misc
@@ -10,6 +10,5 @@ fail2ban_jails:
ipv4_address: "95.216.189.61"
ipv6_address: "2a01:4f9:c010:3052::1"
-dns_servers: ["127.0.0.1"]
wireguard_address: 10.0.0.14
wireguard_public_key: +RJ/ZNRmw2uCHxSjJZHftk7lWUl5nJ6VSZww8GPwhEI=
diff --git a/roles/networking/defaults/main.yml b/roles/networking/defaults/main.yml
index df6f06dc7..eed994a2f 100644
--- a/roles/networking/defaults/main.yml
+++ b/roles/networking/defaults/main.yml
@@ -1,4 +1,3 @@
---
chroot_path: ""
network_interface: "e*"
-dns_servers: []
diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml
index 278967e44..42be3431e 100644
--- a/roles/networking/tasks/main.yml
+++ b/roles/networking/tasks/main.yml
@@ -1,8 +1,4 @@
---
-- name: set fact for local dns resolver in use
- set_fact:
- host_has_local_dns_resolver: "{{ dns_servers|length == 1 and '127.0.0.1' in dns_servers }}"
-
- name: configure network (static)
template: src=10-static-ethernet.network.j2 dest={{ chroot_path }}/etc/systemd/network/10-static-ethernet.network owner=root group=root mode=0644
notify:
diff --git a/roles/networking/templates/10-static-ethernet.network.j2 b/roles/networking/templates/10-static-ethernet.network.j2
index a23511044..50cf96585 100644
--- a/roles/networking/templates/10-static-ethernet.network.j2
+++ b/roles/networking/templates/10-static-ethernet.network.j2
@@ -2,9 +2,6 @@
Name={{ network_interface }}
[Network]
-{% for server in dns_servers %}
-DNS={{server}}
-{% endfor %}
Gateway={{ ipv4_gateway }}
{% if ipv6_gateway is defined %}
Gateway={{ ipv6_gateway }}
--
GitLab