Implement a helper script for zone reloads
It turns out the `rndc` command that was intended to reload a managed zone wasn't working (see PR #91 for reference) if more than one view included the zone. The helper script is really just a wrapper around the `rndc` command itself, it translates its final parameter into a domain/class/view tuple and pass the leading parameters and the tuple to `rndc`.
This commit is contained in:
parent
9091fd6cab
commit
40531e21eb
@ -1,7 +1,6 @@
|
||||
---
|
||||
bind::defaults::supported: false
|
||||
bind::defaults::random_device: '/dev/random'
|
||||
bind::defaults::rndc: true
|
||||
|
||||
bind::forwarders: ''
|
||||
bind::dnssec: true
|
||||
|
||||
@ -5,7 +5,6 @@ class bind (
|
||||
$dnssec = true,
|
||||
$filter_ipv6 = false,
|
||||
$version = '',
|
||||
$rndc = undef,
|
||||
$statistics_port = undef,
|
||||
$auth_nxdomain = false,
|
||||
$include_default_zones = true,
|
||||
@ -43,15 +42,21 @@ class bind (
|
||||
}
|
||||
}
|
||||
|
||||
if $rndc {
|
||||
# rndc only supports HMAC-MD5
|
||||
bind::key { 'rndc-key':
|
||||
algorithm => 'hmac-md5',
|
||||
secret_bits => '512',
|
||||
keydir => $confdir,
|
||||
keyfile => 'rndc.key',
|
||||
include => false,
|
||||
}
|
||||
# rndc only supports HMAC-MD5
|
||||
bind::key { 'rndc-key':
|
||||
algorithm => 'hmac-md5',
|
||||
secret_bits => '512',
|
||||
keydir => $confdir,
|
||||
keyfile => 'rndc.key',
|
||||
include => false,
|
||||
}
|
||||
|
||||
file { '/usr/local/bin/rndc-helper':
|
||||
ensure => present,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
content => template('bind/rndc-helper.erb'),
|
||||
}
|
||||
|
||||
file { "${confdir}/zones":
|
||||
@ -77,6 +82,8 @@ class bind (
|
||||
"${confdir}/acls.conf",
|
||||
"${confdir}/keys.conf",
|
||||
"${confdir}/views.conf",
|
||||
"${confdir}/view-mappings.txt",
|
||||
"${confdir}/domain-mappings.txt",
|
||||
]:
|
||||
owner => 'root',
|
||||
group => $bind_group,
|
||||
|
||||
@ -25,4 +25,9 @@ define bind::view (
|
||||
target => "${::bind::confdir}/views.conf",
|
||||
content => template('bind/view.erb'),
|
||||
}
|
||||
|
||||
concat::fragment { "bind-view-mappings-${name}":
|
||||
target => "${::bind::confdir}/view-mappings.txt",
|
||||
content => template('bind/view-mappings.erb'),
|
||||
}
|
||||
}
|
||||
|
||||
@ -115,7 +115,7 @@ define bind::zone (
|
||||
|
||||
if $zone_file_mode == 'managed' {
|
||||
exec { "rndc reload ${_domain}":
|
||||
command => "/usr/sbin/rndc reload ${_domain}",
|
||||
command => "/usr/local/bin/rndc-helper reload ${name}",
|
||||
user => $bind_user,
|
||||
refreshonly => true,
|
||||
require => Service['bind'],
|
||||
@ -161,4 +161,8 @@ define bind::zone (
|
||||
require => Package['bind'],
|
||||
}
|
||||
|
||||
concat::fragment { "bind-zone-mapping-${name}":
|
||||
target => "${::bind::confdir}/domain-mappings.txt",
|
||||
content => "${name}:${_domain}\n",
|
||||
}
|
||||
}
|
||||
|
||||
19
templates/rndc-helper.erb
Normal file
19
templates/rndc-helper.erb
Normal file
@ -0,0 +1,19 @@
|
||||
#!/bin/bash
|
||||
|
||||
CONFDIR=<%= @confdir %>
|
||||
|
||||
function param_lookup() {
|
||||
local zone_name="${1}"
|
||||
local domain="$(grep "^${zone_name}:" ${CONFDIR}/domain-mappings.txt | cut -f2 -d:)"
|
||||
grep "^${zone_name}:" ${CONFDIR}/view-mappings.txt | cut -f2 -d: | sed -e "s/\(.*\)/${domain} IN \1/"
|
||||
}
|
||||
|
||||
zone_name="${!#}"
|
||||
|
||||
param_lookup "${zone_name}" | while read Z; do
|
||||
if [ $# == 1 ]; then
|
||||
echo $Z
|
||||
else
|
||||
sudo rndc "${@:1:$(($# - 1))}" $Z
|
||||
fi
|
||||
done
|
||||
3
templates/view-mappings.erb
Normal file
3
templates/view-mappings.erb
Normal file
@ -0,0 +1,3 @@
|
||||
<%- @zones.each do |zone| -%>
|
||||
<%= zone %>:<%= @name %>
|
||||
<%- end -%>
|
||||
Loading…
Reference in New Issue
Block a user