Merge pull request #179 from darron/move-log-file

Be able to move the log file with an attribute.
sous-chefs · May 29, 2015 · 7c7a99e · 7c7a99e
2 parents efb204d + 51232b4
commit 7c7a99e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -66,6 +66,7 @@
 default['consul']['bootstrap_expect'] = 3
 default['consul']['data_dir'] = '/var/lib/consul'
 default['consul']['config_dir'] = '/etc/consul.d'
+default['consul']['logfile'] = '/var/log/consul.log'
 case node['platform_family']
 when 'debian'
   default['consul']['etc_config_dir'] = '/etc/default/consul'

diff --git a/recipes/_service.rb b/recipes/_service.rb
@@ -210,6 +210,9 @@
   template init_file do
     source init_tmpl
     mode init_mode
+    variables(
+      consul_logfile: node['consul']['logfile']
+    )
     notifies :restart, 'service[consul]', :immediately
   end
 

diff --git a/templates/default/consul-init.erb b/templates/default/consul-init.erb
@@ -24,7 +24,7 @@ CMD="<%= Chef::Consul.active_binary(node) %> agent -config-dir <%= node['consul'
 NAME="consul"
 
 PIDFILE="/var/run/$NAME.pid"
-LOGFILE="/var/log/$NAME.log"
+LOGFILE="<%= @consul_logfile %>"
 
 get_pid() {
     cat "$PIDFILE"

diff --git a/templates/default/consul.conf.erb b/templates/default/consul.conf.erb
@@ -11,7 +11,7 @@ script
   fi
   export GOMAXPROCS=${GOMAXPROCS}
   CMD="<%= Chef::Consul.active_binary(node) %> agent -config-dir <%= node['consul']['config_dir'] %>"
-  LOGFILE="/var/log/consul.log"
+  LOGFILE="<%= @consul_logfile %>"
   exec $CMD >> "$LOGFILE"
 end script