Add support for latest recursor releases (#138)

AGS4NO · web-flow · commit f2d235381b5c · 2025-07-30T22:09:30.000-04:00
* bump recursor default series to 52
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright (c) 2014-2023 DNSimple Corporation
+Copyright (c) 2014-2025 DNSimple Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
@@ -246,38 +246,38 @@ end
 
 ### pdns_recursor_install
 
-Installs PowerDNS recursor 4.8.x series using PowerDNS official repository in the supported platforms.
+Installs PowerDNS recursor 5.2.x series using PowerDNS official repository in the supported platforms.
 
 #### pdns_recursor_install Properties
 
 | Name           | Type        |  Default value  |
 |----------------|-------------|-----------------|
 | version        | String      | ''              |
-| series         | String      | '48'            |
+| series         | String      | '52'            |
 | debug          | true, false | false           |
 | allow_upgrade  | true, false | false           |
 
 #### pdns_recursor_install Usage examples
 
-Install the latest 5.0.x release PowerDNS recursor
+Install the latest 5.2.x release PowerDNS recursor
 
 ```ruby
-pdns_recursor_install 'latest_5_0_x_recursor'
+pdns_recursor_install 'latest_5_2_x_recursor'
 ```
 
-Install the latest 4.9.x release PowerDNS recursor
+Install the latest 5.1.x release PowerDNS recursor
 
 ```ruby
 pdns_recursor_install 'my_recursor' do
-  series '49'
+  series '51'
 end
 ```
 
-Install and upgrade to the latest 5.0.x PowerDNS recursor release
+Install and upgrade to the latest 5.2.x PowerDNS recursor release
 
 ```ruby
 pdns_recursor_install 'my_recursor' do
-  series '50'
+  series '52'
   allow_upgrade true
 end
 ```
@@ -293,16 +293,13 @@ Creates a PowerDNS recursor configuration.
 | instance_name  | String     | name_property                                               | Yes         |
 | cookbook       | String,nil | 'pdns'                                                      | No          |
 | config_dir     | String     | see `default_recursor_config_directory` helper method       | Yes         |
-| socket_dir     | String     | "/var/run/#{resource.instance_name}"                        | Yes         |
+| run_user       | String     | see `default_recursor_run_user` helper method               | Yes         |
 | source         | String,nil | 'recursor.conf.erb'                                         | No          |
-| variables      | Hash       | {}                                                          | No          |
 | virtual        | Boolean    | false                                                       | No          |
 
 - `cookbook` : Cookbook for a custom configuration template.
 - `config_dir` : Path of the recursor configuration directory.
-- `socket_dir` : Directory where sockets are created.
 - `source` : Name of the recursor custom template.
-- `variables`: Variables for the configuration template.
 - `virtual` : Is this a virtual instance or the default?
 
 ### pdns_recursor_service
@@ -329,34 +326,24 @@ pdns_recursor_service 'default' do
 end
 ```
 
-Configure a virtual PowerDNS recursor service instance named 'my_recursor' in your wrapper cookbook for Acme Corp with a custom template named `my-recursor.erb`
+Configure a virtual PowerDNS recursor service instance named 'my_recursor' in your wrapper cookbook for Acme Corp with a custom template named `my-virtual-recursor.erb`
 
 ```ruby
 pdns_recursor_service 'my_recursor' do
   virtual true
-  source 'my-recursor.erb'
+  source 'my-virtual-recursor.erb'
   cookbook 'acme-pdns-recursor'
 end
 ```
 
-##### Customize the default recursor installation and change it's port to 54
-
-```ruby
-pdns_recursor_config 'default' do
-  variables(
-    'local-port' => '54'
-  )
-end
-```
+##### Customize the default recursor installation
 
 Create a PowerDNS recursor configuration named 'my_recursor' in your wrapper cookbook for Acme Corp which uses a custom template named `my-recursor.erb` and a few attributes:
 
 ```ruby
 pdns_recursor_config 'my_recursor' do
-  virtual true
   source 'my-recursor.erb'
   cookbook 'acme-pdns-recursor'
-  variables(client-tcp-timeout: '20', loglevel: '5', network-timeout: '2000')
 end
 ```
 
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Libraries:: helpers
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metadata.rb b/metadata.rb
@@ -7,8 +7,8 @@
 source_url       'https://github.com/dnsimple/chef-pdns'
 issues_url       'https://github.com/dnsimple/chef-pdns/issues'
 
-chef_version '>= 15'
+chef_version '>= 18'
 
 supports 'ubuntu', '>= 22.04'
 supports 'debian', '>= 11.0'
-supports 'centos', '>= 7.0'
+supports 'centos', '>= 9.0'
diff --git a/resources/authoritative_config.rb b/resources/authoritative_config.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_authoritative_config
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/resources/authoritative_install_debian.rb b/resources/authoritative_install_debian.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_authoritative_install_debian
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
     distribution "#{node['lsb']['codename']}-auth-#{new_resource.series}"
     components ['main']
     key 'powerdns.asc'
+    signed_by true
     cookbook 'pdns'
   end
 
diff --git a/resources/authoritative_install_rhel.rb b/resources/authoritative_install_rhel.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_authoritative_install_rhel
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/resources/authoritative_service.rb b/resources/authoritative_service.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_authoritative_service
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/resources/recursor_config.rb b/resources/recursor_config.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_recursor_config
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,11 +37,10 @@
 }
 property :virtual, [true, false], default: false
 property :config_dir, String, default: lazy { default_recursor_config_directory }
-property :socket_dir, String, default: '/var/run/pdns-recursor'
+property :run_user, String, default: lazy { default_recursor_run_user }
 
 property :source, String, default: 'recursor.conf.erb'
 property :cookbook, String, default: 'pdns'
-property :variables, Hash, default: {}
 
 action :create do
   user 'pdns recursor' do
@@ -74,8 +73,8 @@
     group lazy { default_recursor_run_user }
     mode '0640'
     variables(
-      socket_dir: "#{recursor_socket_directory(new_resource.instance_name, new_resource.socket_dir, new_resource.virtual)}",
-      variables: new_resource.variables
+      config_dir: new_resource.config_dir,
+      run_user: new_resource.run_user
     )
   end
 end
diff --git a/resources/recursor_install_debian.rb b/resources/recursor_install_debian.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_recursor_install
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
   node['platform_version'].to_i >= 9
 end
 
-property :series, String, default: '50'
+property :series, String, default: '52'
 property :version, String
 property :debug, [true, false], default: false
 property :allow_upgrade, [true, false], default: false
diff --git a/resources/recursor_install_rhel.rb b/resources/recursor_install_rhel.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_recursor_install
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 end
 
 property :version, String
-property :series, String, default: '50'
+property :series, String, default: '52'
 property :debug, [true, false], default: false
 property :allow_upgrade, [true, false], default: false
 
diff --git a/resources/recursor_service.rb b/resources/recursor_service.rb
@@ -2,7 +2,7 @@
 # Cookbook:: pdns
 # Resources:: pdns_recursor_service
 #
-# # Copyright:: 2023, DNSimple Corp.
+# # Copyright:: 2025, DNSimple Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/templates/default/recursor.conf.erb b/templates/default/recursor.conf.erb
@@ -1,24 +1,13 @@
 # File generated by Chef, do not edit manually
-
-<% if @config_dir %>
-config-dir= <%= @config_dir %>
-<% end %>
-<% if @socket_dir %>
-socket-dir=<%= @socket_dir %>
-<% end %>
-
-<% @variables.sort.each do |key, value| %>
-<% next if value.nil? %>
-<%= key.to_s.gsub('_', '-') %>=<%=
-  case value
-  when TrueClass
-    'yes'
-  when FalseClass
-    'no'
-  when Array
-    value.join(',')
-  else
-    value
-  end
-%>
-<% end %>
+recursor:
+  include_dir: <%= @config_dir %>/recursor.d
+  <% if node['platform'] == 'centos' %>
+  setuid: <%= @run_user %>
+  setgid: <%= @run_user %>
+  <% end %>
+incoming:
+  listen:
+    - 127.0.0.1
+outgoing:
+  source_address:
+    - 0.0.0.0
diff --git a/test/cookbooks/pdns_test/recipes/recursor_install_multi.rb b/test/cookbooks/pdns_test/recipes/recursor_install_multi.rb
@@ -5,10 +5,9 @@
 pdns_recursor_config 'default'
 
 pdns_recursor_config 'server_02' do
+  cookbook 'pdns_test'
+  source 'server_02.conf.erb'
   virtual true
-  variables(
-    'local-port' => '54'
-  )
 end
 
 pdns_recursor_service 'default' do
diff --git a/test/cookbooks/pdns_test/templates/default/server_02.conf.erb b/test/cookbooks/pdns_test/templates/default/server_02.conf.erb
@@ -0,0 +1,13 @@
+# File generated by Chef, do not edit manually
+recursor:
+  include_dir: <%= @config_dir %>/recursor.d
+  <% if node['platform'] == 'centos' %>
+  setuid: <%= @run_user %>
+  setgid: <%= @run_user %>
+  <% end %>
+incoming:
+  listen:
+    - 127.0.0.1:54
+outgoing:
+  source_address:
+    - 0.0.0.0
diff --git a/test/integration/recursor-multi/default_spec.rb b/test/integration/recursor-multi/default_spec.rb
@@ -27,11 +27,11 @@
 end
 
 describe command('dig -p 53 chaos txt version.bind @127.0.0.1 +short') do
-  its('stdout.chomp') { should match(Regexp.new(/"PowerDNS Recursor 5\.0\.\d/)) }
+  its('stdout.chomp') { should match(Regexp.new(/"PowerDNS Recursor 5\.2\.\d/)) }
 end
 
 describe command('dig -p 54 chaos txt version.bind @127.0.0.1 +short') do
-  its('stdout.chomp') { should match(Regexp.new(/"PowerDNS Recursor 5\.0\.\d/)) }
+  its('stdout.chomp') { should match(Regexp.new(/"PowerDNS Recursor 5\.2\.\d/)) }
 end
 
 describe command('dig -p 53 @127.0.0.1 dnsimple.com') do
@@ -43,7 +43,7 @@
 end
 
 ## Regression test for https://github.com/dnsimple/chef-pdns/issues/89
-describe command('rec_control --config-name=server_02 reload-zones') do
+describe command('rec_control --config-name=server_02 --socket-dir=/run/pdns-recursor-server_02 reload-zones') do
   its('stdout') { should match('ok') }
   its('stdout') { should_not match('unable to parse configuration file') }
   its('stdout') { should_not match('Encountered error reloading zones, keeping original data: Unable to re-parse configuration file') }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Cookbook:: pdns`
`3`	`3`	`# Libraries:: helpers`
`4`	`4`	`#`
`5`		`-# # Copyright:: 2023, DNSimple Corp.`
	`5`	`+# # Copyright:: 2025, DNSimple Corp.`
`6`	`6`	`#`
`7`	`7`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`8`	`8`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Cookbook:: pdns`
`3`	`3`	`# Resources:: pdns_authoritative_config`
`4`	`4`	`#`
`5`		`-# # Copyright:: 2023, DNSimple Corp.`
	`5`	`+# # Copyright:: 2025, DNSimple Corp.`
`6`	`6`	`#`
`7`	`7`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`8`	`8`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Cookbook:: pdns`
`3`	`3`	`# Resources:: pdns_authoritative_install_rhel`
`4`	`4`	`#`
`5`		`-# # Copyright:: 2023, DNSimple Corp.`
	`5`	`+# # Copyright:: 2025, DNSimple Corp.`
`6`	`6`	`#`
`7`	`7`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`8`	`8`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Cookbook:: pdns`
`3`	`3`	`# Resources:: pdns_authoritative_service`
`4`	`4`	`#`
`5`		`-# # Copyright:: 2023, DNSimple Corp.`
	`5`	`+# # Copyright:: 2025, DNSimple Corp.`
`6`	`6`	`#`
`7`	`7`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`8`	`8`	`# you may not use this file except in compliance with the License.`