X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..49035fa1602ce39f429375fc3807c9b00e548937:/cookbooks/geodns/recipes/default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index ad2288c12..250f148c4 100644
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -22,11 +22,6 @@ package %w[
   gdnsd
 ]
 
-service "gdnsd" do
-  action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
-end
-
 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
@@ -43,6 +38,17 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   notifies :restart, "service[gdnsd]"
 end
 
+if node[:lsb][:release].to_f >= 18.04
+  service "systemd-resolved" do
+    action [:disable, :stop]
+  end
+end
+
+service "gdnsd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
 firewall_rule "accept-dns-udp" do
   action :accept
   source "net"