Update formatting of header comments

[chef.git] / cookbooks / geodns / recipes / default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 250f148c453120cc2747d8275b846aa48b36ae31..f24f1b8deecaadc03ec803e555e530d1a3a31b9f 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: geodns
+# Cookbook:: geodns

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -18,10 +18,23 @@
 #
 
 package %w[
 #
 
 package %w[

-  geoip-database-contrib
+  geoipupdate

   gdnsd
 ]
 
   gdnsd
 ]
 

+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
   source "config.erb"
   owner "root"
 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"


@@ -38,17 +51,34 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   notifies :restart, "service[gdnsd]"
 end
 
   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
 
 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"
 firewall_rule "accept-dns-udp" do
   action :accept
   source "net"