X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5e24b54879d5ab466e8e25db58437787ae63493b..188037016cf450567df0778ece9108818376a46c:/cookbooks/geodns/recipes/default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 2308a5793..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,20 +17,16 @@
 # 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"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[gdnsd]"
 end
 
@@ -38,10 +34,21 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   source "geo.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   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"