Don't disable systemd-resolved on geodns machines

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 0bd74fb8e6d5d9ee37a1d864a8fc60a2ae44fe7d..0e20e2a26c140c4e1804a2567de46ea2975dbf83 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,53 +17,37 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "pdns-server"
-package "pdns-backend-geo"
+package %w[
+  geoipupdate
+  gdnsd
+]

 
 

-service "pdns" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
-end
-
-file "/etc/powerdns/pdns.d/pdns.simplebind" do
-  action :delete
-  notifies :reload, resources(:service => "pdns")
-end
-
-template "/etc/powerdns/pdns.d/geo.conf" do
-  source "geo.conf.erb"
-  owner "root"
-  group "root"
-  mode "0600"
-  notifies :reload, resources(:service => "pdns")
-end
-
-directory "/etc/powerdns/zones.d" do
-  owner "root"
+execute "geoipdate" do
+  command "geoipupdate"
+  user "root"

   group "root"
   group "root"

-  mode "0755"
+  not_if { ::File.exist?("/var/lib/GeoIP/GeoLite2-Country.mmdb") }

 end
 
 end
 

-template "/etc/powerdns/zones.d/tile.conf" do
-  source "tile.conf.erb"
+template "/etc/gdnsd/config" do
+  source "config.erb"

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode "0644"
-  notifies :reload, resources(:service => "pdns")
+  mode 0o644
+  notifies :restart, "service[gdnsd]"

 end
 
 end
 

-template "/etc/cron.weekly/geodns-update" do
-  source "cron.erb"
+template "/etc/gdnsd/zones/geo.openstreetmap.org" do
+  source "geo.erb"

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode "0755"
+  mode 0o644
+  notifies :restart, "service[gdnsd]"

 end
 
 end
 

-execute "geodns-sync-countries" do
-  command "rsync -z rsync://countries-ns.mdc.dk/zone/zz.countries.nerd.dk.rbldnsd /etc/powerdns/countries.conf"
-  user "root"
-  group "root"
-  not_if { File.exist?("/etc/powerdns/countries.conf") }
+service "gdnsd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true

 end
 
 firewall_rule "accept-dns-udp" do
 end
 
 firewall_rule "accept-dns-udp" do