X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..64499e46eecd244b02e789288d11d409040917e2:/cookbooks/geodns/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index a0ee24646..250f148c4 100644
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,14 +17,10 @@
 # limitations under the License.
 #
 
-package "geoip-database-contrib"
-
-package "gdnsd"
-
-service "gdnsd" do
-  action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
-end
+package %w[
+  geoip-database-contrib
+  gdnsd
+]
 
 template "/etc/gdnsd/config" do
   source "config.erb"
@@ -42,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"