Skip to content

Commit be3800d

Browse files
tampakraptampakrap
committed
whitespace
1 parent 49843cb commit be3800d

File tree

2 files changed

+76
-77
lines changed

2 files changed

+76
-77
lines changed

‎manifests/config.pp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@
101101
}
102102

103103
$opts = {
104-
105-
'include' => "\"${bind::params::config_base_dir}/${bind::params::default_zones_file}\"",
106-
'match-clients' => [ '"any"' ],
107-
'recursion' => 'no',
108-
}
104+
'include' => "\"${bind::params::config_base_dir}/${bind::params::default_zones_file}\"",
105+
'match-clients' => [ '"any"' ],
106+
'recursion' => 'no',
107+
}
109108

110109
$options = deep_merge($opts, $bind::default_view)
111110

‎manifests/params.pp‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -20,80 +20,80 @@
2020
}
2121

2222
if $::osfamily == 'Debian' {
23-
$package_name = 'bind9'
24-
$service_name = 'bind9'
25-
$bind_user = 'bind'
26-
$bind_group = 'bind'
27-
$service_has_status = true
28-
#$service_pattern will only be used if $service_has_status is false
29-
$service_pattern = undef
30-
$service_restart = '/etc/init.d/bind9 reload'
31-
$config_base_dir = '/etc/bind'
32-
$named_conf_name = 'named.conf'
33-
$named_local_name = 'named.conf.local'
34-
$zones_directory = '/etc/bind/zones'
35-
$pri_directory = '/etc/bind/pri'
36-
$keys_directory = '/etc/bind/keys'
37-
$dynamic_directory = '/etc/bind/dynamic'
38-
$acls_directory = '/etc/bind/acls'
39-
$views_directory = '/etc/bind/views'
40-
$default_zones_file = 'named.conf.default-zones'
41-
$default_config = {
42-
'directory' => '"/var/cache/bind"',
43-
'dnssec-validation' => 'auto',
44-
'auth-nxdomain' => 'no',
45-
'listen-on-v6' => ['any'],
46-
}
47-
if $bind::chroot {
48-
fail('Chroot mode is not yet implemented for Debian in this module.')
49-
}
23+
$package_name = 'bind9'
24+
$service_name = 'bind9'
25+
$bind_user = 'bind'
26+
$bind_group = 'bind'
27+
$service_has_status = true
28+
#$service_pattern will only be used if $service_has_status is false
29+
$service_pattern = undef
30+
$service_restart = '/etc/init.d/bind9 reload'
31+
$config_base_dir = '/etc/bind'
32+
$named_conf_name = 'named.conf'
33+
$named_local_name = 'named.conf.local'
34+
$zones_directory = '/etc/bind/zones'
35+
$pri_directory = '/etc/bind/pri'
36+
$keys_directory = '/etc/bind/keys'
37+
$dynamic_directory = '/etc/bind/dynamic'
38+
$acls_directory = '/etc/bind/acls'
39+
$views_directory = '/etc/bind/views'
40+
$default_zones_file = 'named.conf.default-zones'
41+
$default_config = {
42+
'directory' => '"/var/cache/bind"',
43+
'dnssec-validation' => 'auto',
44+
'auth-nxdomain' => 'no',
45+
'listen-on-v6' => ['any'],
46+
}
47+
if $bind::chroot {
48+
fail('Chroot mode is not yet implemented for Debian in this module.')
49+
}
5050
}
5151
elsif $::osfamily == 'RedHat' {
52-
if $bind::chroot {
53-
$package_name = 'bind-chroot'
54-
$service_name = 'named-chroot'
55-
# moving this under named so it also is available within the chroot.
56-
$named_local_name = 'named/named.conf.local'
57-
} else {
58-
$package_name = 'bind'
59-
$service_name = 'named'
60-
$named_local_name = 'named.conf.local'
61-
}
62-
$bind_user = 'named'
63-
$bind_group = 'named'
64-
$service_pattern = undef
65-
if versioncmp($::operatingsystemmajrelease,'7') < 0 {
66-
$service_restart = "/etc/init.d/${service_name} restart"
67-
$service_has_status = false
68-
} else {
69-
$service_restart = "/usr/bin/systemctl reload ${service_name}"
70-
$service_has_status = true
71-
}
72-
$config_base_dir = '/etc'
73-
$named_conf_name = 'named.conf'
74-
$zones_directory = '/etc/named/zones'
75-
$pri_directory = '/etc/named/pri'
76-
$keys_directory = '/etc/named/keys'
77-
$dynamic_directory = '/etc/named/dynamic'
78-
$acls_directory = '/etc/named/acls'
79-
$views_directory = '/etc/named/views'
80-
$default_zones_file = 'named.rfc1912.zones'
81-
$default_config = {
82-
'allow-query' => ['localhost'],
83-
'auth-nxdomain' => 'no',
84-
'bindkeys-file' => '"/etc/named.iscdlv.key"',
85-
'directory' => '"/var/named"',
86-
'dnssec-enable' => 'yes',
87-
'dnssec-validation' => 'yes',
88-
'dump-file' => '"/var/named/data/cache_dump.db"',
89-
'managed-keys-directory' => '"/var/named/dynamic"',
90-
'memstatistics-file' => '"/var/named/data/named_mem_stats.txt"',
91-
'pid-file' => '"/run/named/named.pid"',
92-
'listen-on' => ['127.0.0.1'],
93-
'listen-on-v6' => ['::1'],
94-
'session-keyfile' => '"/run/named/session.key"',
95-
'statistics-file' => '"/var/named/data/named_stats.txt"',
96-
}
52+
if $bind::chroot {
53+
$package_name = 'bind-chroot'
54+
$service_name = 'named-chroot'
55+
# moving this under named so it also is available within the chroot.
56+
$named_local_name = 'named/named.conf.local'
57+
} else {
58+
$package_name = 'bind'
59+
$service_name = 'named'
60+
$named_local_name = 'named.conf.local'
61+
}
62+
$bind_user = 'named'
63+
$bind_group = 'named'
64+
$service_pattern = undef
65+
if versioncmp($::operatingsystemmajrelease,'7') < 0 {
66+
$service_restart = "/etc/init.d/${service_name} restart"
67+
$service_has_status = false
68+
} else {
69+
$service_restart = "/usr/bin/systemctl reload ${service_name}"
70+
$service_has_status = true
71+
}
72+
$config_base_dir = '/etc'
73+
$named_conf_name = 'named.conf'
74+
$zones_directory = '/etc/named/zones'
75+
$pri_directory = '/etc/named/pri'
76+
$keys_directory = '/etc/named/keys'
77+
$dynamic_directory = '/etc/named/dynamic'
78+
$acls_directory = '/etc/named/acls'
79+
$views_directory = '/etc/named/views'
80+
$default_zones_file = 'named.rfc1912.zones'
81+
$default_config = {
82+
'allow-query' => ['localhost'],
83+
'auth-nxdomain' => 'no',
84+
'bindkeys-file' => '"/etc/named.iscdlv.key"',
85+
'directory' => '"/var/named"',
86+
'dnssec-enable' => 'yes',
87+
'dnssec-validation' => 'yes',
88+
'dump-file' => '"/var/named/data/cache_dump.db"',
89+
'managed-keys-directory' => '"/var/named/dynamic"',
90+
'memstatistics-file' => '"/var/named/data/named_mem_stats.txt"',
91+
'pid-file' => '"/run/named/named.pid"',
92+
'listen-on' => ['127.0.0.1'],
93+
'listen-on-v6' => ['::1'],
94+
'session-keyfile' => '"/run/named/session.key"',
95+
'statistics-file' => '"/var/named/data/named_stats.txt"',
96+
}
9797
}
9898
else {
9999
fail "Unknown ${::operatingsystem}"

0 commit comments

Comments
 (0)