X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ee8a123dd9ad0fcb3341d7a285edcd46cad224f5..974e549653ae69774fb0b10674e9c69f1e947b06:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index a308e535d..f6015a17e 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -50,6 +50,8 @@ node[:networking][:interfaces].each do |name, interface|
     node.normal[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
     node.normal[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
 
+    interface = node[:networking][:interfaces][name]
+
     deviceplan = if interface[:interface] =~ /^(.*)\.(\d+)$/
                    netplan["network"]["vlans"][interface[:interface]] ||= {
                      "id" => Regexp.last_match(2).to_i,
@@ -174,20 +176,22 @@ template "/etc/hosts" do
   mode 0o644
 end
 
-unless node[:networking][:nameservers].empty?
-  link "/etc/resolv.conf" do
-    action :delete
-    link_type :symbolic
-    to "/run/resolvconf/resolv.conf"
-    only_if { File.symlink?("/etc/resolv.conf") }
-  end
+service "systemd-resolved" do
+  action [:enable, :start]
+end
 
-  template "/etc/resolv.conf" do
-    source "resolv.conf.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-  end
+directory "/etc/systemd/resolved.conf.d" do
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+template "/etc/systemd/resolved.conf.d/99-chef.conf" do
+  source "resolved.conf.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  notifies :restart, "service[systemd-resolved]"
 end
 
 node.interfaces(:role => :internal) do |interface|