Page MenuHomeSoftware Heritage

No OneTemporary

diff --git a/manifests/init.pp b/manifests/init.pp
index f7c1d6d..603f321 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,90 +1,91 @@
class bind (
$confdir = $bind::params::confdir,
$cachedir = $bind::params::cachedir,
$forwarders = [],
$dnssec = true,
+ $version = '',
) inherits bind::params {
include concat::setup
$auth_nxdomain = false
package { $bind::params::bind_package:
ensure => latest,
}
if $dnssec {
file { '/usr/local/bin/dnssec-init':
ensure => present,
owner => 'root',
group => 'root',
mode => '0755',
source => 'puppet:///modules/bind/dnssec-init',
}
}
service { $bind::params::bind_service:
ensure => running,
enable => true,
hasrestart => true,
hasstatus => true,
require => Package[$bind::params::bind_package],
}
file { $confdir:
ensure => directory,
owner => 'root',
group => $bind::params::bind_group,
mode => '2755',
purge => true,
require => Package[$bind::params::bind_package],
}
file { "${confdir}/named.conf":
ensure => present,
owner => 'root',
group => $bind::params::bind_group,
mode => '0644',
content => template('bind/named.conf.erb'),
notify => Service[$bind::params::bind_service],
require => Package[$bind::params::bind_package],
}
file { [ "${confdir}/zones", "${confdir}/keys" ]:
ensure => directory,
owner => 'root',
group => $bind::params::bind_group,
mode => '0755',
require => Package[$bind::params::bind_package],
}
concat { [
"${confdir}/acls.conf",
"${confdir}/keys.conf",
"${confdir}/views.conf",
]:
owner => 'root',
group => $bind::params::bind_group,
mode => '0644',
notify => Service[$bind::params::bind_service],
require => Package[$bind::params::bind_package],
}
concat::fragment { "named-acls-header":
order => '00',
target => "${confdir}/acls.conf",
content => "# This file is managed by puppet - changes will be lost\n",
}
concat::fragment { "named-keys-header":
order => '00',
target => "${confdir}/keys.conf",
content => "# This file is managed by puppet - changes will be lost\n",
}
concat::fragment { "named-views-header":
order => '00',
target => "${confdir}/views.conf",
content => "# This file is managed by puppet - changes will be lost\n",
}
}
diff --git a/templates/named.conf.erb b/templates/named.conf.erb
index f2ed75f..4dcf836 100644
--- a/templates/named.conf.erb
+++ b/templates/named.conf.erb
@@ -1,20 +1,23 @@
# This file is managed by puppet - changes will be lost
include "<%= confdir %>/acls.conf";
include "<%= confdir %>/keys.conf";
include "<%= confdir %>/views.conf";
options {
directory "<%= cachedir %>";
<%- if not forwarders.empty? -%>
forwarders {
-<%- forwarders.each do |forwarder| -%>
+<%- forwarders.each do |forwarder| -%>
<%= forwarder %>;
-<%- end -%>
+<%- end -%>
};
<%- end -%>
auth-nxdomain <%= auth_nxdomain ? 'yes' : 'no' %>;
listen-on-v6 { any; };
dnssec-enable <%= dnssec ? 'yes' : 'no' %>;
dnssec-validation <%= dnssec ? 'yes' : 'no' %>;
dnssec-lookaside <%= dnssec ? 'auto' : 'no' %>;
+<%- if version != '' -%>
+ version "<%= version %>";
+<%- end -%>
};

File Metadata

Mime Type
text/x-diff
Expires
Mon, Aug 18, 10:06 PM (1 d, 14 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3331865

Event Timeline