Skip to content

Commit

Permalink
Add following properties: baseurl/gpgkey/debug_baseurl (CentOS only)
Browse files Browse the repository at this point in the history
- STATE -
Currently, the way the custom resource "pdns_recursor_install" is
created does not allow to change the PowerDNS yum repository (in case,
we mirror PowerDNS)

- FIX -
Add 3 new properties:
  - baseurl: to set PowerDNS repository URL
  - gpgkey: to set PowerDNS repository gpg key
  - debug_baseurl: to set PowerDNS debug repository URL

Change-Id: I2dacb6158a1d19b46e423539f9b8bf64e036114f
  • Loading branch information
Jeremy MAURO committed May 12, 2017
1 parent 1a46e4c commit 2852e61
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ Installs PowerDNS recursor 4.X series using PowerDNS official repository in the

- `version`: Which version is installed, defaults to the latest version available in the repository.
- `debug`: (CentOS only), installs debug-symbols from PowerDNS debug repository.
- `baseurl`: (CentOS only), set the PowerDNS repository URL (Default: 'http://repo.powerdns.com/centos/$basearch/$releasever/rec-40')
- `gpgkey`: (CentOS only), set the PowerDNS repository gpg key URL (Default: 'https://repo.powerdns.com/FD380FBB-pub.asc')
- `debug_baseurl`: (CentOS only), set the PowerDNS debug repository URL (Default: 'http://repo.powerdns.com/centos/$basearch/$releasever/rec-40/debug')

#### Usage Example

Expand Down
21 changes: 13 additions & 8 deletions resources/pdns_recursor_install_rhel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
property :instance_name, String, name_property: true
property :version, [String, nil], default: nil
property :debug, [true, false], default: false
property :baseurl, String, default: 'http://repo.powerdns.com/centos/$basearch/$releasever/rec-40'
property :gpgkey, String, default: 'https://repo.powerdns.com/FD380FBB-pub.asc'
property :debug_baseurl, [String, nil], default: 'http://repo.powerdns.com/centos/$basearch/$releasever/rec-40/debug'

action :install do

Expand All @@ -37,19 +40,21 @@
only_if { node['platform_version'].to_i == 6 }
end

yum_repository 'powerdns-rec-40' do
description 'PowerDNS repository for PowerDNS Recursor - version 4.0.X'
baseurl 'http://repo.powerdns.com/centos/$basearch/$releasever/rec-40'
gpgkey 'https://repo.powerdns.com/FD380FBB-pub.asc'
repository_version = new_resource.baseurl.split('/').last

yum_repository "powerdns-#{repository_version}" do
description "PowerDNS repository for PowerDNS Recursor - #{repository_version}"
baseurl new_resource.baseurl
gpgkey new_resource.gpgkey
priority '90'
includepkgs 'pdns*'
action :create
end

yum_repository 'powerdns-rec-40-debuginfo' do
description 'PowerDNS repository for PowerDNS Recursor - version 4.0.X debug symbols'
baseurl 'http://repo.powerdns.com/centos/$basearch/$releasever/rec-40/debug'
gpgkey 'https://repo.powerdns.com/FD380FBB-pub.asc'
yum_repository "powerdns-#{repository_version}-debuginfo" do
description "PowerDNS repository for PowerDNS Recursor - #{repository_version} debug symbols"
baseurl new_resource.debug_baseurl
gpgkey new_resource.gpgkey
priority '90'
includepkgs 'pdns*'
action :create
Expand Down

0 comments on commit 2852e61

Please sign in to comment.