Merge remote-tracking branch 'github/pull/713'

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index b40a7643f9c7082e6d035861f97f70c248d7058b..90ae979becdf1344caaf7e2845c2f62ab3a0e1d0 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -27,6 +27,10 @@ package %w[
   gdnsd
 ]
 
+link "/etc/gdnsd/geoip/GeoLite2-Country.mmdb" do
+  to "#{node[:geoipupdate][:directory]}/GeoLite2-Country.mmdb"
+end
+
 directory "/etc/gdnsd/config.d" do
   owner "nobody"
   group "nogroup"
@@ -90,16 +94,14 @@ end
 
 firewall_rule "accept-dns-udp" do
   action :accept
-  source "net"
-  dest "fw"
-  proto "udp"
+  context :incoming
+  protocol :udp
   dest_ports "domain"
 end
 
 firewall_rule "accept-dns-tcp" do
   action :accept
-  source "net"
-  dest "fw"
-  proto "tcp"
+  context :incoming
+  protocol :tcp
   dest_ports "domain"
 end