Project

General

Profile

« Previous | Next » 

Revision 616cda32

Added by Greg Sutcliffe about 11 years ago

Use concat_output for file content source, so we get the old file Filebucketed on change

(Also, whitespace cleanup in init.pp)

View differences:

manifests/init.pp
class dns(
$namedconf_path = $dns::params::namedconf_path,
$dnsdir = $dns::params::dnsdir,
$dns_server_package = $dns::params::dns_server_package,
$rndckeypath = $dns::params::rndckeypath,
$rndc_alg = $dns::params::rndc_alg,
$rndc_secret = $dns::params::rndc_secret,
$optionspath = $dns::params::optionspath,
$publicviewpath = $dns::params::publicviewpath,
$vardir = $dns::params::vardir,
$namedservicename = $dns::params::namedservicename,
$zonefilepath = $dns::params::zonefilepath,
$localzonepath = $dns::params::localzonepath,
$forwarders = $dns::params::forwarders
$namedconf_path = $dns::params::namedconf_path,
$dnsdir = $dns::params::dnsdir,
$dns_server_package = $dns::params::dns_server_package,
$rndckeypath = $dns::params::rndckeypath,
$rndc_alg = $dns::params::rndc_alg,
$rndc_secret = $dns::params::rndc_secret,
$optionspath = $dns::params::optionspath,
$publicviewpath = $dns::params::publicviewpath,
$vardir = $dns::params::vardir,
$namedservicename = $dns::params::namedservicename,
$zonefilepath = $dns::params::zonefilepath,
$localzonepath = $dns::params::localzonepath,
$forwarders = $dns::params::forwarders
) inherits dns::params {
package { 'dns':
ensure => installed,
name => $dns_server_package,
}
package { 'dns':
ensure => installed,
name => $dns_server_package,
}
group { $dns::params::group:
require => Package['dns']
}
group { $dns::params::group:
require => Package['dns']
}
File {
require => Package['dns'],
}
File {
require => Package['dns'],
}
file {
$namedconf_path:
owner => root,
group => $dns::params::group,
mode => '0640',
require => Package['dns'],
notify => Service[$namedservicename],
content => template('dns/named.conf.erb');
$optionspath:
owner => root,
group => $dns::params::group,
mode => '0640',
notify => Service[$namedservicename],
content => template('dns/options.conf.erb');
$zonefilepath:
ensure => directory,
owner => $dns::params::user,
group => $dns::params::group,
mode => '0640';
"${vardir}/puppetstore":
ensure => directory,
group => $dns::params::group,
mode => '0640';
}
concat_build { 'dns_zones':
order => ['*.dns'],
}
concat_build { 'dns_zones':
order => ['*.dns'],
target => $publicviewpath,
notify => Service[$namedservicename],
}
concat_fragment { 'dns_zones+01-header.dns':
content => ' ',
}
concat_fragment { 'dns_zones+01-header.dns':
content => ' ',
}
file {
$namedconf_path:
owner => root,
group => $dns::params::group,
mode => '0640',
notify => Service[$namedservicename],
content => template('dns/named.conf.erb');
$publicviewpath:
owner => root,
group => $dns::params::group,
mode => '0640',
require => Concat_build['dns_zones'],
notify => Service[$namedservicename],
source => concat_output('dns_zones');
$optionspath:
owner => root,
group => $dns::params::group,
mode => '0640',
notify => Service[$namedservicename],
content => template('dns/options.conf.erb');
$zonefilepath:
ensure => directory,
owner => $dns::params::user,
group => $dns::params::group,
mode => '0640';
"${vardir}/puppetstore":
ensure => directory,
group => $dns::params::group,
mode => '0640';
}
service {
$namedservicename:
ensure => running,
enable => true,
hasstatus => true,
hasrestart => true,
require => Package['dns'];
}
service {
$namedservicename:
ensure => running,
enable => true,
hasstatus => true,
hasrestart => true,
require => Package['dns'];
}
exec { 'create-rndc.key':
command => "/usr/sbin/rndc-confgen -r /dev/urandom -a -c ${rndckeypath}",
cwd => '/tmp',
creates => $rndckeypath,
require => Package['dns'],
}
exec { 'create-rndc.key':
command => "/usr/sbin/rndc-confgen -r /dev/urandom -a -c ${rndckeypath}",
cwd => '/tmp',
creates => $rndckeypath,
require => Package['dns'],
}
file { $rndckeypath:
owner => 'root',
group => $dns::params::group,
mode => '0640',
require => Exec['create-rndc.key'],
}
file { $rndckeypath:
owner => 'root',
group => $dns::params::group,
mode => '0640',
require => Exec['create-rndc.key'],
}
}

Also available in: Unified diff