Add support for distributing gdnsd configuration via rsync

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index a0ee24646fe42e075b1555d43bacc7e1eb35ecf9..9f7c100c5b6b0f8eff17db8f455b6564b7442383 100644 (file)
--- 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,13 +17,22 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "geoip-database-contrib"
+package %w[
+  geoipupdate
+  gdnsd
+]

 
 

-package "gdnsd"
+execute "geoipdate" do
+  command "geoipupdate"
+  user "root"
+  group "root"
+  not_if { ::File.exist?("/var/lib/GeoIP/GeoLite2-Country.mmdb") }
+end

 
 

-service "gdnsd" do
-  action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
+directory "/etc/gdnsd/config.d" do
+  owner "nobody"
+  group "nogroup"
+  mode 0o755

 end
 
 template "/etc/gdnsd/config" do
 end
 
 template "/etc/gdnsd/config" do


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