Skip to content

Commit 8b61e16

Browse files
gramsa49kenyon
authored andcommitted
Series of changes:
- Add additional Bind::Options: dnssec-enable, dnssec-validation, listen-on, listen-on-v6, recursion, tkey-gssapi-keytab, version - Enable support for TSIG authentication for: allow-transfer, allow-update, also_notify - Fix an issue with Bind::Logging when using syslog channel logging
1 parent 67956ed commit 8b61e16

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

manifests/zone.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
#
6363
define bind::zone (
6464
Pattern[/\.$/] $zone_name = $title,
65-
Optional[Array[Variant[Stdlib::Host, Stdlib::IP::Address]]] $allow_transfer = undef,
66-
Optional[Array[Variant[Stdlib::Host, Stdlib::IP::Address]]] $allow_update = undef,
67-
Optional[Array[Variant[Stdlib::Host, Stdlib::IP::Address]]] $also_notify = undef,
65+
Optional[Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]]] $allow_transfer = undef,
66+
Optional[Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]]] $allow_update = undef,
67+
Optional[Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]]] $also_notify = undef,
6868
Optional[Enum['allow', 'maintain', 'off']] $auto_dnssec = undef,
6969
Optional[Enum['IN', 'HS', 'hesiod', 'CHAOS']] $class = undef,
7070
Optional[String[1]] $file = undef,

templates/etc/bind/named.conf.epp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ logging {
3939
print-time <%= $channel_config['print-time'] %>;
4040
<%- } if $channel_config['severity'] { -%>
4141
severity <%= $channel_config['severity'] %>;
42+
<%- } if $channel_config['syslog'] { -%>
43+
syslog <%= $channel_config['syslog'] %>;
4244
<%- } -%>
4345
<%- } -%>
4446
<%- } -%>

types/options.pp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@
55
# Reference: https://bind9.readthedocs.io/en/latest/reference.html#options-statement-grammar
66
#
77
type Bind::Options = Struct[{
8-
Optional['allow-transfer'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address]],
9-
Optional['allow-update'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address]],
8+
Optional['allow-transfer'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]],
9+
Optional['allow-update'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]],
1010
Optional['allow-query'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address]],
11-
Optional['also-notify'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address]],
11+
Optional['also-notify'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]],
1212
Optional['auto-dnssec'] => Enum['allow', 'maintain', 'off'],
1313
Optional['directory'] => Stdlib::Absolutepath,
14+
Optional['dnssec-enable'] => Variant[Boolean, Stdlib::Yes_no],
15+
Optional['dnssec-validation'] => Stdlib::Compat::String,
1416
Optional['inline-signing'] => Variant[Boolean, Stdlib::Yes_no],
1517
Optional['key-directory'] => String[1],
18+
Optional['listen-on'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]],
19+
Optional['listen-on-v6'] => Array[Variant[Stdlib::Host, Stdlib::IP::Address, Stdlib::Compat::String]],
20+
Optional['recursion'] => Variant[Boolean, Stdlib::Yes_no],
1621
Optional['serial-update-method'] => Enum['date', 'increment', 'unixtime'],
22+
Optional['tkey-gssapi-keytab'] => Stdlib::Absolutepath,
23+
Optional['version'] => Stdlib::Compat::String,
1724
Optional['zone-statistics'] => Variant[Boolean, Stdlib::Yes_no, Enum['full', 'terse', 'none']],
1825
}]

0 commit comments

Comments
 (0)