From 2048b9f42b5dcd61d7b9505b3ce270c3e7e2f67c Mon Sep 17 00:00:00 2001
From: Paulo Tada <paulohtfs@gmail.com>
Date: Wed, 4 May 2016 22:41:45 -0300
Subject: [PATCH] Modularizing rsyslog into server and default

---
 cookbooks/rsyslog/recipes/default.rb | 20 --------------------
 cookbooks/rsyslog/recipes/server.rb  | 21 +++++++++++++++++++++
 roles/monitoring_server.rb           |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 cookbooks/rsyslog/recipes/server.rb

diff --git a/cookbooks/rsyslog/recipes/default.rb b/cookbooks/rsyslog/recipes/default.rb
index e969639..0909e59 100644
--- a/cookbooks/rsyslog/recipes/default.rb
+++ b/cookbooks/rsyslog/recipes/default.rb
@@ -1,18 +1,7 @@
-package 'rsyslog-mysql' do
-  action [:install, :upgrade]
-end
 package 'rsyslog' do
   action [:install, :upgrade]
 end
 
-SPB_LOG='/var/log/spb.log'
-
-file SPB_LOG do
-  owner 'root'
-  group 'root'
-  mode 0644
-end
-
 template "/etc/rsyslog.d/spb_log.conf" do
   owner 'root'
   group 'root'
@@ -24,12 +13,3 @@ service 'rsyslog' do
   action [:enable, :restart]
 end
 
-execute 'allowing-spb-log' do
-  command 'semanage fcontext -a -t httpd_sys_rw_content_t '+SPB_LOG
-  user 'root'
-end
-
-execute 'enable-spb-log' do
-  command 'restorecon -v '+SPB_LOG
-  user 'root'
-end
diff --git a/cookbooks/rsyslog/recipes/server.rb b/cookbooks/rsyslog/recipes/server.rb
new file mode 100644
index 0000000..ac28105
--- /dev/null
+++ b/cookbooks/rsyslog/recipes/server.rb
@@ -0,0 +1,21 @@
+package 'rsyslog-mysql' do
+  action [:install, :upgrade]
+end
+
+SPB_LOG='/var/log/spb.log'
+
+file SPB_LOG do
+  owner 'root'
+  group 'root'
+  mode 0644
+end
+
+execute 'allowing-spb-log' do
+  command 'semanage fcontext -a -t httpd_sys_rw_content_t ' + SPB_LOG
+  user 'root'
+end
+
+execute 'enable-spb-log' do
+  command 'restorecon -v ' + SPB_LOG
+  user 'root'
+end
diff --git a/roles/monitoring_server.rb b/roles/monitoring_server.rb
index e491809..e0cb18d 100644
--- a/roles/monitoring_server.rb
+++ b/roles/monitoring_server.rb
@@ -1,3 +1,3 @@
 name 'monitoring_server'
 description 'Monitoring server'
-run_list 'recipe[munin]', 'recipe[rsyslog]', 'recipe[loganalyzer]'
+run_list 'recipe[munin]', 'recipe[rsyslog]', 'recipe[rsyslog::server]', 'recipe[loganalyzer]'
--
libgit2 0.21.2