From e3b6f55b0158e7eb196ee71f6e5e4f956412ed74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Wed, 15 Jun 2022 00:33:40 +0200 Subject: profiles::dhcpd dnsupdatekey only if possible. --- manifests/dhcpd.pp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/manifests/dhcpd.pp b/manifests/dhcpd.pp index bf3f965..d3c5635 100644 --- a/manifests/dhcpd.pp +++ b/manifests/dhcpd.pp @@ -7,6 +7,12 @@ class profiles::dhcpd ( $menu = 'Raspberry Pi Boot' $menu_len = length($menu) + if defined('$dns::dnsdir') { + $updatekey = "${dns::dnsdir}/${keyname}.key" + } else { + $updatekey = undef + } + class { 'dhcp': service_ensure => running, dnsdomain => [ @@ -19,7 +25,7 @@ class profiles::dhcpd ( nameservers => [ '10.0.0.40', ], nameservers_ipv6 => [ '2001:9b1:eff:a600:2d8:61ff:fe51:d925', ], interfaces => [ $facts['networking']['primary'], ], - dnsupdatekey => "${dns::dnsdir}/${keyname}.key", + dnsupdatekey => $updatekey, dnskeyname => $keyname, # require => Dns::Key[$keyname], globaloptions => [ @@ -60,8 +66,10 @@ class profiles::dhcpd ( ], } - user { 'dhcp': - membership => 'minimum', - groups => [ $dns::group, ], + if defined('$dns::group') { + user { 'dhcp': + membership => 'minimum', + groups => [ $dns::group, ], + } } } -- cgit v1.2.3