Add user and group attributes to logrotate conf

Icinga · Jul 19, 2016 · 1baf547 · 1baf547
1 parent b10d5f5
commit 1baf547
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/recipes/core_config.rb b/recipes/core_config.rb
@@ -63,7 +63,7 @@
   owner 'root'
   group 'root'
   mode 0o644
-  variables(:log_dir => node['icinga2']['log_dir'])
+  variables(:log_dir => node['icinga2']['log_dir'], :user => node['icinga2']['user'], :group => node['icinga2']['group'])
 end
 
 # icinga2.conf

diff --git a/templates/default/icinga2.logrotate.erb b/templates/default/icinga2.logrotate.erb
@@ -4,32 +4,31 @@
 #
 
 <%= @log_dir -%>/icinga2.log <%= @log_dir -%>/debug.log {
-  daily
+	daily
 	rotate 7
-	su icinga icinga
+	su <%= @user -%> <%= @group %>
 	compress
 	delaycompress
-  missingok
-  notifempty
-  create 644 icinga icinga
+	missingok
+	notifempty
+	create 644 <%= @user -%> <%= @group %>
 	copytruncate
 	postrotate
 		if ! killall -q -USR1 icinga2; then
 			exit 1
 		fi
-  endscript
+	endscript
 }
 
 <%= @log_dir -%>/error.log {
 	daily
-	su icinga icinga
+	su <%= @user -%> <%= @group %>
 	rotate 90
 	compress
 	delaycompress
 	missingok
 	notifempty
-	create 644 icinga icinga
+	create 644 <%= @user -%> <%= @group %>
 	copytruncate
 	# TODO: figure out how to get Icinga to re-open this log file
 }
-