X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19aeb7bfffb852ab8be005c004b1ef8e555a5b77..86aeaefd2b815793d4bed90170428068e60f7c9f:/cookbooks/geodns/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index a21323026..16ba44ed5 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,
@@ -18,13 +18,21 @@
 #
 
 package %w[
-  geoip-database-contrib
+  geoipupdate
   gdnsd
 ]
 
-service "gdnsd" do
-  action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
+execute "geoipdate" do
+  command "geoipupdate"
+  user "root"
+  group "root"
+  not_if { ::File.exist?("/var/lib/GeoIP/GeoLite2-Country.mmdb") }
+end
+
+directory "/etc/gdnsd/config.d" do
+  owner "nobody"
+  group "nogroup"
+  mode 0o755
 end
 
 template "/etc/gdnsd/config" do
@@ -43,6 +51,34 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   notifies :restart, "service[gdnsd]"
 end
 
+service "gdnsd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
+systemd_service "gdnsd-reload" do
+  description "Reload gdnsd configuration"
+  type "simple"
+  user "root"
+  exec_start "/bin/systemctl reload-or-restart gdnsd"
+  standard_output "null"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+end
+
+systemd_path "gdnsd-reload" do
+  description "Reload gdnsd configuration"
+  path_changed "/etc/gdnsd/config.d"
+end
+
+service "gdnsd-reload.path" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_path[gdnsd-reload]"
+end
+
 firewall_rule "accept-dns-udp" do
   action :accept
   source "net"