Modularizing rsyslog into server and default

Paulo Tada
1 parent 764b1eac
Showing 3 changed files with 22 additions and 21 deletions Show diff stats
cookbooks/rsyslog/recipes/default.rb
cookbooks/rsyslog/recipes/server.rb
roles/monitoring_server.rb
-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 &#39;rsyslog&#39; 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
@@ -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
 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]'
1		-package 'rsyslog-mysql' do
2		- action [:install, :upgrade]
3		-end
4	1	package 'rsyslog' do
5	2	action [:install, :upgrade]
6	3	end
7	4
8		-SPB_LOG='/var/log/spb.log'
9		-
10		-file SPB_LOG do
11		- owner 'root'
12		- group 'root'
13		- mode 0644
14		-end
15		-
16	5	template "/etc/rsyslog.d/spb_log.conf" do
17	6	owner 'root'
18	7	group 'root'
...	...	@@ -24,12 +13,3 @@ service 'rsyslog' do
24	13	action [:enable, :restart]
25	14	end
26	15
27		-execute 'allowing-spb-log' do
28		- command 'semanage fcontext -a -t httpd_sys_rw_content_t '+SPB_LOG
29		- user 'root'
30		-end
31		-
32		-execute 'enable-spb-log' do
33		- command 'restorecon -v '+SPB_LOG
34		- user 'root'
35		-end
...	...
...	...	@@ -0,0 +1,21 @@
	1	+package 'rsyslog-mysql' do
	2	+ action [:install, :upgrade]
	3	+end
	4	+
	5	+SPB_LOG='/var/log/spb.log'
	6	+
	7	+file SPB_LOG do
	8	+ owner 'root'
	9	+ group 'root'
	10	+ mode 0644
	11	+end
	12	+
	13	+execute 'allowing-spb-log' do
	14	+ command 'semanage fcontext -a -t httpd_sys_rw_content_t ' + SPB_LOG
	15	+ user 'root'
	16	+end
	17	+
	18	+execute 'enable-spb-log' do
	19	+ command 'restorecon -v ' + SPB_LOG
	20	+ user 'root'
	21	+end
...	...
1	1	name 'monitoring_server'
2	2	description 'Monitoring server'
3		-run_list 'recipe[munin]', 'recipe[rsyslog]', 'recipe[loganalyzer]'
	3	+run_list 'recipe[munin]', 'recipe[rsyslog]', 'recipe[rsyslog::server]', 'recipe[loganalyzer]'
...	...