From 28745a2d4a0cdcf088af5240c67c77f0cde16bb4 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 16 Dec 2012 15:07:38 +0100 Subject: named.options -> named.conf.options --- puppet/modules/site_config/files/named.conf.options | 6 ++++++ puppet/modules/site_config/files/named.options | 6 ------ puppet/modules/site_config/manifests/resolvconf.pp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 puppet/modules/site_config/files/named.conf.options delete mode 100644 puppet/modules/site_config/files/named.options (limited to 'puppet') diff --git a/puppet/modules/site_config/files/named.conf.options b/puppet/modules/site_config/files/named.conf.options new file mode 100644 index 00000000..47df6c5d --- /dev/null +++ b/puppet/modules/site_config/files/named.conf.options @@ -0,0 +1,6 @@ +options { + allow-query { 127.0.0.1; }; + allow-transfer { none; }; + listen-on { 127.0.0.1; }; +}; + diff --git a/puppet/modules/site_config/files/named.options b/puppet/modules/site_config/files/named.options deleted file mode 100644 index 47df6c5d..00000000 --- a/puppet/modules/site_config/files/named.options +++ /dev/null @@ -1,6 +0,0 @@ -options { - allow-query { 127.0.0.1; }; - allow-transfer { none; }; - listen-on { 127.0.0.1; }; -}; - diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp index b70dfa1c..78f83a62 100644 --- a/puppet/modules/site_config/manifests/resolvconf.pp +++ b/puppet/modules/site_config/manifests/resolvconf.pp @@ -16,8 +16,8 @@ class site_config::resolvconf { notify => Service['bind9'], } - file { '/etc/bind/named.options': - source => 'puppet:///modules/site_config/named.options', + file { '/etc/bind/named.conf.options': + source => 'puppet:///modules/site_config/named.conf.options', require => Package['bind9'], notify => Service['bind9'], } -- cgit v1.2.3