Drop mod_php support

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index f24f1b8deecaadc03ec803e555e530d1a3a31b9f..f017fb1242da37dc597a9348b85a69f22794c57c 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -17,24 +17,31 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "geoipupdate"
+

 package %w[
 package %w[

-  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
 
 directory "/etc/gdnsd/config.d" do
   owner "nobody"
   group "nogroup"
   mode 0o755
 end
 

+%w[tile nominatim].each do |zone|
+  %w[map resource weighted].each do |type|
+    template "/etc/gdnsd/config.d/#{zone}.#{type}" do
+      action :create_if_missing
+      source "zone.#{type}.erb"
+      owner "nobody"
+      group "nogroup"
+      mode 0o644
+      variables :zone => zone
+    end
+  end
+end
+

 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"