summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2023-06-10 20:20:43 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2023-06-10 20:23:57 +0200
commit6bef3cc487985a9de833391f5ccad68c547d42b1 (patch)
treeef661845684708c7d0345309ecbf40618ef18bbd
parentQualify CNAMEs. (diff)
downloaddns-6bef3cc487985a9de833391f5ccad68c547d42b1.tar.gz
dns-6bef3cc487985a9de833391f5ccad68c547d42b1.tar.xz
Rename keyfiles to .key.HEADmaster
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/key.pp2
-rw-r--r--templates/named.conf.epp2
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index a07a3b7..a4c1b84 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -109,7 +109,7 @@ class dns (
file { [
"${zoneconf_dir}/empty.conf",
- "${keyconf_dir}/empty.conf",
+ "${keyconf_dir}/empty.key",
]:
source => "puppet:///modules/${module_name}/empty.conf",
}
diff --git a/manifests/key.pp b/manifests/key.pp
index d66026e..3802bad 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -18,7 +18,7 @@ define dns::key (
String $keyname = $name,
Enum['present', 'absent'] $ensure = 'present',
) {
- file { "${dns::keyconf_dir}/${keyname}.conf":
+ file { "${dns::keyconf_dir}/${keyname}.key":
ensure => $ensure,
content => epp("${module_name}/key.epp", {
keyname => $keyname,
diff --git a/templates/named.conf.epp b/templates/named.conf.epp
index 5a57452..7fc0421 100644
--- a/templates/named.conf.epp
+++ b/templates/named.conf.epp
@@ -23,4 +23,4 @@ controls {
<%# Include remaining stuff %>
include "<%= $dns::zoneconf_dir %>/*.conf";
-include "<%= $dns::keyconf_dir %>/*.conf";
+include "<%= $dns::keyconf_dir %>/*.key";