Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add default values for openSUSE / SLES #78

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add default values for openSUSE / SLES #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7fe332
whitespace
tampakrap Sep 30, 2016
d5094f6
unhardcode the path of the named local file in /etc/named.conf
tampakrap Sep 30, 2016
1fa0cba
add default values for openSUSE / SLES
tampakrap Sep 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions files/suse_default-zones
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Managed by Puppet
# Extracted from SUSE's default /etc/named.conf

# The following zone definitions don't need any modification. The first one
# is the definition of the root name servers. The second one defines
# localhost while the third defines the reverse lookup for localhost.

zone "." in {
type hint;
file "root.hint";
};

zone "localhost" in {
type master;
file "localhost.zone";
};

zone "0.0.127.in-addr.arpa" in {
type master;
file "127.0.0.zone";
};

zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN {
type master;
file "127.0.0.zone";
};
33 changes: 22 additions & 11 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,31 @@
mode => '0775',
}

file {'/var/log/named':
ensure => directory,
group => 'adm',
mode => '0750',
owner => $bind::params::bind_user,
seltype => 'named_log_t',
if $::osfamily == 'Debian' or $::osfamily == 'RedHat' {
file {'/var/log/named':
ensure => directory,
group => 'adm',
mode => '0750',
owner => $bind::params::bind_user,
seltype => 'named_log_t',
}
}

$opts = {

'include' => "\"${bind::params::config_base_dir}/${bind::params::default_zones_file}\"",
'match-clients' => [ '"any"' ],
'recursion' => 'no',
if $::osfamily == 'Suse' {
file {'/etc/named.d/default-zones':
ensure => file,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/bind/suse_default-zones',
}
}

$opts = {
'include' => "\"${bind::params::config_base_dir}/${bind::params::default_zones_file}\"",
'match-clients' => [ '"any"' ],
'recursion' => 'no',
}

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

Expand Down
196 changes: 119 additions & 77 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,31 @@
# Please refer to Class['bind'].

class bind::params {
if $::osfamily == 'Debian' {
$package_name = 'bind9'
$service_name = 'bind9'
$bind_user = 'bind'
$bind_group = 'bind'
$service_has_status = true
#$service_pattern will only be used if $service_has_status is false
$service_pattern = undef
$service_restart = '/etc/init.d/bind9 reload'
$config_base_dir = '/etc/bind'
$named_conf_name = 'named.conf'
$named_local_name = 'named.conf.local'
$zones_directory = '/etc/bind/zones'
$pri_directory = '/etc/bind/pri'
$keys_directory = '/etc/bind/keys'
$dynamic_directory = '/etc/bind/dynamic'
$acls_directory = '/etc/bind/acls'
$views_directory = '/etc/bind/views'
$default_zones_file = 'named.conf.default-zones'
$default_config = {
'directory' => '"/var/cache/bind"',
'dnssec-validation' => 'auto',
'auth-nxdomain' => 'no',
'listen-on-v6' => ['any'],
}
$default_logging = {
'channels' => {
'simple_log' => {
Expand All @@ -18,84 +43,101 @@
'default' => 'simple_log',
},
}

if $::osfamily == 'Debian' {
$package_name = 'bind9'
$service_name = 'bind9'
$bind_user = 'bind'
$bind_group = 'bind'
$service_has_status = true
#$service_pattern will only be used if $service_has_status is false
$service_pattern = undef
$service_restart = '/etc/init.d/bind9 reload'
$config_base_dir = '/etc/bind'
$named_conf_name = 'named.conf'
$named_local_name = 'named.conf.local'
$zones_directory = '/etc/bind/zones'
$pri_directory = '/etc/bind/pri'
$keys_directory = '/etc/bind/keys'
$dynamic_directory = '/etc/bind/dynamic'
$acls_directory = '/etc/bind/acls'
$views_directory = '/etc/bind/views'
$default_zones_file = 'named.conf.default-zones'
$default_config = {
'directory' => '"/var/cache/bind"',
'dnssec-validation' => 'auto',
'auth-nxdomain' => 'no',
'listen-on-v6' => ['any'],
}
if $bind::chroot {
fail('Chroot mode is not yet implemented for Debian in this module.')
}
if $bind::chroot {
fail('Chroot mode is not yet implemented for Debian in this module.')
}
}
elsif $::osfamily == 'RedHat' {
if $bind::chroot {
$package_name = 'bind-chroot'
$service_name = 'named-chroot'
# moving this under named so it also is available within the chroot.
$named_local_name = 'named/named.conf.local'
} else {
$package_name = 'bind'
$service_name = 'named'
$named_local_name = 'named.conf.local'
}
$bind_user = 'named'
$bind_group = 'named'
$service_pattern = undef
if versioncmp($::operatingsystemmajrelease,'7') < 0 {
$service_restart = "/etc/init.d/${service_name} restart"
$service_has_status = false
} else {
$service_restart = "/usr/bin/systemctl reload ${service_name}"
$service_has_status = true
}
$config_base_dir = '/etc'
$named_conf_name = 'named.conf'
$zones_directory = '/etc/named/zones'
$pri_directory = '/etc/named/pri'
$keys_directory = '/etc/named/keys'
$dynamic_directory = '/etc/named/dynamic'
$acls_directory = '/etc/named/acls'
$views_directory = '/etc/named/views'
$default_zones_file = 'named.rfc1912.zones'
$default_config = {
'allow-query' => ['localhost'],
'auth-nxdomain' => 'no',
'bindkeys-file' => '"/etc/named.iscdlv.key"',
'directory' => '"/var/named"',
'dnssec-enable' => 'yes',
'dnssec-validation' => 'yes',
'dump-file' => '"/var/named/data/cache_dump.db"',
'managed-keys-directory' => '"/var/named/dynamic"',
'memstatistics-file' => '"/var/named/data/named_mem_stats.txt"',
'pid-file' => '"/run/named/named.pid"',
'listen-on' => ['127.0.0.1'],
'listen-on-v6' => ['::1'],
'session-keyfile' => '"/run/named/session.key"',
'statistics-file' => '"/var/named/data/named_stats.txt"',
}
elsif $::osfamily == 'RedHat' {
if $bind::chroot {
$package_name = 'bind-chroot'
$service_name = 'named-chroot'
# moving this under named so it also is available within the chroot.
$named_local_name = 'named/named.conf.local'
} else {
$package_name = 'bind'
$service_name = 'named'
$named_local_name = 'named.conf.local'
}
$bind_user = 'named'
$bind_group = 'named'
$service_pattern = undef
if versioncmp($::operatingsystemmajrelease,'7') < 0 {
$service_restart = "/etc/init.d/${service_name} restart"
$service_has_status = false
} else {
$service_restart = "/usr/bin/systemctl reload ${service_name}"
$service_has_status = true
}
$config_base_dir = '/etc'
$named_conf_name = 'named.conf'
$zones_directory = '/etc/named/zones'
$pri_directory = '/etc/named/pri'
$keys_directory = '/etc/named/keys'
$dynamic_directory = '/etc/named/dynamic'
$acls_directory = '/etc/named/acls'
$views_directory = '/etc/named/views'
$default_zones_file = 'named.rfc1912.zones'
$default_config = {
'allow-query' => ['localhost'],
'auth-nxdomain' => 'no',
'bindkeys-file' => '"/etc/named.iscdlv.key"',
'directory' => '"/var/named"',
'dnssec-enable' => 'yes',
'dnssec-validation' => 'yes',
'dump-file' => '"/var/named/data/cache_dump.db"',
'managed-keys-directory' => '"/var/named/dynamic"',
'memstatistics-file' => '"/var/named/data/named_mem_stats.txt"',
'pid-file' => '"/run/named/named.pid"',
'listen-on' => ['127.0.0.1'],
'listen-on-v6' => ['::1'],
'session-keyfile' => '"/run/named/session.key"',
'statistics-file' => '"/var/named/data/named_stats.txt"',
}
$default_logging = {
'channels' => {
'simple_log' => {
'file' => '"/var/log/named/bind.log"',
'severity' => 'warning',
'print-time' => 'yes',
'print-severity' => 'yes',
'print-category' => 'yes',
},
},
'categories' => {
'default' => 'simple_log',
},
}
else {
fail "Unknown ${::operatingsystem}"
}
elsif $::osfamily == 'Suse' {
$package_name = 'bind'
$service_name = 'named'
$named_local_name = 'named.conf.include'
$bind_user = 'named'
$bind_group = 'named'
$service_pattern = undef
$service_restart = "/usr/bin/systemctl reload ${service_name}"
$service_has_status = true
$config_base_dir = '/etc'
$named_conf_name = 'named.conf'
$zones_directory = '/etc/named.d/zones'
$pri_directory = '/etc/named.d/pri'
$keys_directory = '/etc/named.d/keys'
$dynamic_directory = '/etc/named.d/dyn'
$acls_directory = '/etc/named.d/acls'
$views_directory = '/etc/named.d/views'
$default_zones_file = 'named.d/default-zones'
$default_config = {
'directory' => '"/var/lib/named"',
'managed-keys-directory' => '"/var/lib/named/dyn"',
'dump-file' => '"/var/log/named_dump.db"',
'statistics-file' => '"/var/log/named.stats"',
'listen-on-v6' => ['any'],
'notify' => 'no',
'disable-empty-zone' => '"1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"',
}
$default_logging = {}
}
else {
fail "Unknown ${::operatingsystem}"
}
}
12 changes: 12 additions & 0 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
"operatingsystemrelease": [
"14.04"
]
},
{
"operatingsystem": "SLES",
"operatingsystemrelease": [
"12"
]
},
{
"operatingsystem": "openSUSE",
"operatingsystemrelease": [
"42.2"
]
}
],
"dependencies": [
Expand Down
2 changes: 2 additions & 0 deletions spec/defines/bind_generate_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
'/etc/bind'
when 'RedHat'
'/etc/named'
when 'Suse'
'/etc/named.d'
end
end

Expand Down
2 changes: 2 additions & 0 deletions spec/defines/bind_key_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
'/etc/bind'
when 'RedHat'
'/etc/named'
when 'Suse'
'/etc/named.d'
end
end

Expand Down
2 changes: 2 additions & 0 deletions spec/defines/bind_view_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
'/etc/bind'
when 'RedHat'
'/etc/named'
when 'Suse'
'/etc/named.d'
end
end

Expand Down
4 changes: 3 additions & 1 deletion spec/defines/bind_zone_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
'/etc/bind'
when 'RedHat'
'/etc/named'
when 'Suse'
'/etc/named.d'
end
end

let(:bind_group) do
case facts[:osfamily]
when 'Debian'
'bind'
when 'RedHat'
when /RedHat|Suse/
'named'
end
end
Expand Down
2 changes: 1 addition & 1 deletion templates/named.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include "<%=scope.lookupvar("bind::params::config_base_dir")%>/acls.conf";
include "<%=scope.lookupvar("bind::params::config_base_dir")%>/named.conf.options";
include "<%=scope.lookupvar("bind::params::config_base_dir")%>/named.conf.local";
include "<%=scope.lookupvar("bind::params::config_base_dir")%>/<%=scope.lookupvar("bind::params::named_local_name")%>";
2 changes: 2 additions & 0 deletions templates/named.conf.options.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ options {
<%end -%>
};

<%- unless @logging.empty? -%>
logging {
<% @logging['channels'].sort.each do |key, hash| -%>
channel <%=key%> {
Expand All @@ -40,3 +41,4 @@ logging {
};
<%end -%>
};
<%end -%>