Use backports for smartmontools on debian

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 16ba44ed5f6b820587b7ab7ae853fdb5c5947e16..a50b711411b461253de52123f894e3f3784bf230 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.


@@ -17,29 +17,40 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "geoipupdate"
+
+servers = search(:node, "roles:geodns").collect(&:name).sort
+
+servers << "dummy.example.com" if servers.empty?
+

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

-  mode 0o755
+  mode "755"
+end
+
+%w[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 "644"
+      variables :zone => zone
+    end
+  end

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

-  mode 0o644
+  mode "644"

   notifies :restart, "service[gdnsd]"
 end
 
   notifies :restart, "service[gdnsd]"
 end
 


@@ -47,7 +58,8 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   source "geo.erb"
   owner "root"
   group "root"
   source "geo.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"
+  variables :servers => servers

   notifies :restart, "service[gdnsd]"
 end
 
   notifies :restart, "service[gdnsd]"
 end
 


@@ -62,11 +74,8 @@ systemd_service "gdnsd-reload" do
   user "root"
   exec_start "/bin/systemctl reload-or-restart gdnsd"
   standard_output "null"
   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
+  sandbox true
+  restrict_address_families "AF_UNIX"

 end
 
 systemd_path "gdnsd-reload" do
 end
 
 systemd_path "gdnsd-reload" do


@@ -81,16 +90,14 @@ end
 
 firewall_rule "accept-dns-udp" do
   action :accept
 
 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
   dest_ports "domain"
 end
 
 firewall_rule "accept-dns-tcp" do
   action :accept

-  source "net"
-  dest "fw"
-  proto "tcp:syn"
+  context :incoming
+  protocol :tcp

   dest_ports "domain"
 end
   dest_ports "domain"
 end