From 281f909fa4807105f151bfeae7ee0574a41d798b Mon Sep 17 00:00:00 2001
From: bondarev <alexander.i.bondarev@gmail.com>
Date: Wed, 26 Dec 2012 15:12:29 +0400
Subject: [PATCH] Support custom log path

---
 attributes/default.rb                    | 18 ++++++++++--------
 recipes/default.rb                       |  2 +-
 templates/default/named.conf.options.erb |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index e80690e..45c7ca4 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -14,15 +14,17 @@
 case platform
 when "centos","redhat","fedora","scientific","amazon"
   default[:bind9][:config_path] = "/etc/named"
-	default[:bind9][:config_file] = "/etc/named.conf"
-	default[:bind9][:options_file] = "/etc/named/named.conf.options"
-	default[:bind9][:local_file] = "/etc/named/named.conf.local"
-	default[:bind9][:data_path] = "/var/named"
+  default[:bind9][:config_file] = "/etc/named.conf"
+  default[:bind9][:options_file] = "/etc/named/named.conf.options"
+  default[:bind9][:local_file] = "/etc/named/named.conf.local"
+  default[:bind9][:data_path] = "/var/named"
+  default[:bind9][:log_path] = "/var/log/bind"
   default[:bind9][:user] = "named"
 else
   default[:bind9][:config_path] = "/etc/bind"
-	default[:bind9][:options_file] = "/etc/bind/named.conf.options"
-	default[:bind9][:local_file] = "/etc/bind/named.conf.local"
-	default[:bind9][:data_path] = "/var/cache/bind"
-  default[:bind9][:user] = "bind"
+  default[:bind9][:options_file] = "/etc/bind/named.conf.options"
+  default[:bind9][:local_file] = "/etc/bind/named.conf.local"
+  default[:bind9][:data_path] = "/var/cache/bind"
+  default[:bind9][:log_path] = "/var/log/named"
+  default[:bind9][:user] = "bind"  
 end
diff --git a/recipes/default.rb b/recipes/default.rb
index 5c749ce..e2e89c4 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -25,7 +25,7 @@
   action :install
 end
 
-directory "/var/log/bind/" do
+directory node[:bind9][:log_path] do
   owner node[:bind9][:user]
   group node[:bind9][:user]
   mode 0755
diff --git a/templates/default/named.conf.options.erb b/templates/default/named.conf.options.erb
index 1d536a9..eaba99b 100644
--- a/templates/default/named.conf.options.erb
+++ b/templates/default/named.conf.options.erb
@@ -41,7 +41,7 @@ options {
 
 logging {
   channel default_log {
-    file "/var/log/bind/bind.log" versions 5 size 128M;
+    file "<%= node[:bind9][:log_path] %>/bind.log" versions 5 size 128M;
     print-time yes;
     print-severity yes;
     print-category yes;