|
38 | 38 | } else {
|
39 | 39 | $_source = 'puppet:///modules/bind/db.empty'
|
40 | 40 | }
|
| 41 | + |
41 | 42 | file { "${cachedir}/${name}":
|
42 | 43 | ensure => directory,
|
43 | 44 | owner => $bind::params::bind_user,
|
|
46 | 47 | require => Package['bind'],
|
47 | 48 | }
|
48 | 49 |
|
49 |
| - unless $zone_type == 'stub' { |
50 |
| - file { "${cachedir}/${name}/${_domain}": |
51 |
| - ensure => present, |
52 |
| - owner => $bind::params::bind_user, |
53 |
| - group => $bind::params::bind_group, |
54 |
| - mode => '0644', |
55 |
| - replace => false, |
56 |
| - source => $_source, |
57 |
| - audit => [ content ], |
58 |
| - } |
| 50 | + file { "${cachedir}/${name}/${_domain}": |
| 51 | + ensure => present, |
| 52 | + owner => $bind::params::bind_user, |
| 53 | + group => $bind::params::bind_group, |
| 54 | + mode => '0644', |
| 55 | + replace => false, |
| 56 | + source => $_source, |
| 57 | + audit => [ content ], |
| 58 | + } |
59 | 59 |
|
60 |
| - if $dnssec { |
61 |
| - exec { "dnssec-keygen-${name}": |
62 |
| - command => "/usr/local/bin/dnssec-init '${cachedir}' '${name}'\ |
63 |
| - '${_domain}' '${key_directory}'", |
64 |
| - cwd => $cachedir, |
65 |
| - user => $bind::params::bind_user, |
66 |
| - creates => "${cachedir}/${name}/${_domain}.signed", |
67 |
| - timeout => 0, # crypto is hard |
68 |
| - require => [ |
69 |
| - File['/usr/local/bin/dnssec-init'], |
70 |
| - File["${cachedir}/${name}/${_domain}"] |
71 |
| - ], |
72 |
| - } |
| 60 | + if $dnssec { |
| 61 | + exec { "dnssec-keygen-${name}": |
| 62 | + command => "/usr/local/bin/dnssec-init '${cachedir}' '${name}'\ |
| 63 | + '${_domain}' '${key_directory}'", |
| 64 | + cwd => $cachedir, |
| 65 | + user => $bind::params::bind_user, |
| 66 | + creates => "${cachedir}/${name}/${_domain}.signed", |
| 67 | + timeout => 0, # crypto is hard |
| 68 | + require => [ |
| 69 | + File['/usr/local/bin/dnssec-init'], |
| 70 | + File["${cachedir}/${name}/${_domain}"] |
| 71 | + ], |
| 72 | + } |
73 | 73 |
|
74 |
| - file { "${cachedir}/${name}/${_domain}.signed": |
75 |
| - owner => $bind::params::bind_user, |
76 |
| - group => $bind::params::bind_group, |
77 |
| - mode => '0644', |
78 |
| - audit => [ content ], |
79 |
| - } |
| 74 | + file { "${cachedir}/${name}/${_domain}.signed": |
| 75 | + owner => $bind::params::bind_user, |
| 76 | + group => $bind::params::bind_group, |
| 77 | + mode => '0644', |
| 78 | + audit => [ content ], |
80 | 79 | }
|
81 | 80 | }
|
82 | 81 | }
|
83 |
| - |
| 82 | + |
84 | 83 | file { "${bind::confdir}/zones/${name}.conf":
|
85 | 84 | ensure => present,
|
86 | 85 | owner => 'root',
|
|
0 commit comments