Bump cookstyle from 6.21.1 to 7.0.0

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 8a72c17a20e5212153cd682d1f4c50fc6b68a506..43643c2f9bd0ba0d227a10d873baf0051fef575a 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,58 +17,36 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-service "pdns" do
-  action [ :stop, :disable ]
-  supports :status => true, :restart => true, :reload => true
-end
-
-file "/etc/powerdns/countries.conf" do
-  action :delete
-end
+include_recipe "geoipupdate"

 
 

-file "/etc/powerdns/pdns.d/pdns.simplebind" do
-  action :delete
-  notifies :reload, "service[pdns]"
-end
-
-file "/etc/powerdns/pdns.d/geo.conf" do
-  action :delete
-end
+package %w[
+  gdnsd
+]

 
 

-file "/etc/powerdns/zones.d/tile.conf" do
-  action :delete
+directory "/etc/gdnsd/config.d" do
+  owner "nobody"
+  group "nogroup"
+  mode "755"

 end
 
 end
 

-directory "/etc/powerdns/zones.d" do
-  action :delete
-end
-
-file "/etc/cron.weekly/geodns-update" do
-  action :delete
-end
-
-package "pdns-backend-geo" do
-  action :purge
-end
-
-package "pdns-server" do
-  action :purge
-end
-
-package "geoip-database-contrib"
-
-package "gdnsd"
-
-service "gdnsd" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+%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 "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 0644
+  mode "644"

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


@@ -76,10 +54,38 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   source "geo.erb"
   owner "root"
   group "root"
   source "geo.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

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

+service "gdnsd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
+systemd_service "gdnsd-reload" do
+  description "Reload gdnsd configuration"
+  type "simple"
+  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
+end
+
+systemd_path "gdnsd-reload" do
+  description "Reload gdnsd configuration"
+  path_changed "/etc/gdnsd/config.d"
+end
+
+service "gdnsd-reload.path" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_path[gdnsd-reload]"
+end
+

 firewall_rule "accept-dns-udp" do
   action :accept
   source "net"
 firewall_rule "accept-dns-udp" do
   action :accept
   source "net"