le1t0-deprec 2.1.6.039 → 2.1.6.040

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/CHANGELOG +4 -0
  2. data/lib/deprec/recipes/syslog/syslog_ng.rb +19 -1
  3. data/lib/deprec/templates/syslog_ng/syslog-ng.conf.erb +44 -1
  4. metadata +4 -4
data/CHANGELOG CHANGED
@@ -1,5 +1,9 @@
1
1
  # deprec changelog
2
2
 
3
+ = 2.1.6.040 (Jul 23, 2010)
4
+
5
+ * Added local* facility syslogging
6
+
3
7
  = 2.1.6.039 (Jul 23, 2010)
4
8
 
5
9
  * Added facilities to f_daemons for syslog_ng
data/lib/deprec/recipes/syslog/syslog_ng.rb CHANGED
@@ -67,6 +67,15 @@ Capistrano::Configuration.instance(:must_exist).load do
67
67
  :f_mail => "facility(mail)",
68
68
  :f_news => "facility(news)",
69
69
  :f_user => "facility(user)",
70
+ :f_local => "facility(local0,local1,local2,local3,local4,local5,local6,local7)"
71
+ :f_local0 => "facility(local0)",
72
+ :f_local1 => "facility(local1)",
73
+ :f_local2 => "facility(local2)",
74
+ :f_local3 => "facility(local3)",
75
+ :f_local4 => "facility(local4)",
76
+ :f_local5 => "facility(local5)",
77
+ :f_local6 => "facility(local6)",
78
+ :f_local7 => "facility(local7)",
70
79
  :f_uucp => "facility(uucp)",
71
80
  :f_at_least_info => "level(info..emerg)",
72
81
  :f_at_least_notice => "level(notice..emerg)",
@@ -77,7 +86,7 @@ Capistrano::Configuration.instance(:must_exist).load do
77
86
  :f_messages => "level(info,notice,warn) and not facility(auth,authpriv,cron,daemon,mail,news)",
78
87
  :f_emerg => "level(emerg)",
79
88
  :f_xconsole => "facility(daemon,mail) or level(debug,info,notice,warn) or (facility(news) and level(crit,err,notice))",
80
- :f_daemons => "program(\"(rails|apache|postfix|haproxy|mysql|keepalived|sphinx|firewall)-.*\") or facility(user,local0,local1,local2,local3,local4,local5,local6,local7)"
89
+ :f_daemons => "program(\"(rails|apache|postfix|haproxy|mysql|keepalived|sphinx|firewall)-.*\")"
81
90
  }
82
91
  set :syslog_ng_destinations, {
83
92
  :df_auth => "file(\"/var/log/auth.log\")",
@@ -88,6 +97,15 @@ Capistrano::Configuration.instance(:must_exist).load do
88
97
  :df_lpr => "file(\"/var/log/lpr.log\")",
89
98
  :df_mail => "file(\"/var/log/mail.log\")",
90
99
  :df_user => "file(\"/var/log/user.log\")",
100
+ :df_local => "file(\"/var/log/daemons/local/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
101
+ :df_local0 => "file(\"/var/log/daemons/local0/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
102
+ :df_local1 => "file(\"/var/log/daemons/local1/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
103
+ :df_local2 => "file(\"/var/log/daemons/local2/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
104
+ :df_local3 => "file(\"/var/log/daemons/local3/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
105
+ :df_local4 => "file(\"/var/log/daemons/local4/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
106
+ :df_local5 => "file(\"/var/log/daemons/local5/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
107
+ :df_local6 => "file(\"/var/log/daemons/local6/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
108
+ :df_local7 => "file(\"/var/log/daemons/local7/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")",
91
109
  :df_uucp => "file(\"/var/log/uucp.log\")",
92
110
  :df_facility_dot_info => "file(\"/var/log/$FACILITY.info\")",
93
111
  :df_facility_dot_notice => "file(\"/var/log/$FACILITY.notice\")",
data/lib/deprec/templates/syslog_ng/syslog-ng.conf.erb CHANGED
@@ -31,16 +31,59 @@ destination <%= name %> {
31
31
  <% end %>
32
32
 
33
33
  <% syslog_ng_logs.merge(syslog_ng_is_server && syslog_use_default_dynamic_settings ? {
34
+ # on syslog master/central server daemon
34
35
  :s_net => {
35
36
  :df_daemons => {
36
37
  :filters => :f_daemons,
37
38
  :flags => :final
39
+ },
40
+ :df_local0 => {
41
+ :filters => :f_local0,
42
+ :flags => :final
43
+ },
44
+ :df_local1 => {
45
+ :filters => :f_local1,
46
+ :flags => :final
47
+ },
48
+ :df_local2 => {
49
+ :filters => :f_local2,
50
+ :flags => :final
51
+ },
52
+ :df_local3 => {
53
+ :filters => :f_local3,
54
+ :flags => :final
55
+ },
56
+ :df_local4 => {
57
+ :filters => :f_local4,
58
+ :flags => :final
59
+ },
60
+ :df_local5 => {
61
+ :filters => :f_local5,
62
+ :flags => :final
63
+ },
64
+ :df_local6 => {
65
+ :filters => :f_local6,
66
+ :flags => :final
67
+ },
68
+ :df_local7 => {
69
+ :filters => :f_local7,
70
+ :flags => :final
38
71
  }
39
72
  }
40
73
  } : {}).each do |source_name, destinations_filters|
41
74
  if source_name == :s_all && syslog_ng_server && syslog_use_default_dynamic_settings && !syslog_ng_is_server
75
+ # on syslog client daemon
42
76
  destinations_filters.merge!(
43
- [ :df_daemons, :d_log_server ] => { :filters => :f_daemons, :flags => :final})
77
+ [ :df_daemons, :d_log_server ] => { :filters => :f_daemons, :flags => :final },
78
+ [ :df_local0, :d_log_server ] => { :filters => :f_local0, :flags => :final },
79
+ [ :df_local1, :d_log_server ] => { :filters => :f_local1, :flags => :final },
80
+ [ :df_local2, :d_log_server ] => { :filters => :f_local2, :flags => :final },
81
+ [ :df_local3, :d_log_server ] => { :filters => :f_local3, :flags => :final },
82
+ [ :df_local4, :d_log_server ] => { :filters => :f_local4, :flags => :final },
83
+ [ :df_local5, :d_log_server ] => { :filters => :f_local5, :flags => :final },
84
+ [ :df_local6, :d_log_server ] => { :filters => :f_local6, :flags => :final },
85
+ [ :df_local7, :d_log_server ] => { :filters => :f_local7, :flags => :final }
86
+ )
44
87
  end
45
88
  destinations_filters.each do |destinations, filters| %>
46
89
  log {
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 2
7
7
  - 1
8
8
  - 6
9
- - 39
10
- version: 2.1.6.039
9
+ - 40
10
+ version: 2.1.6.040
11
11
  platform: ruby
12
12
  authors:
13
13
  - Le1t0
@@ -29,8 +29,8 @@ dependencies:
29
29
  - 2
30
30
  - 5
31
31
  - 18
32
- - 13
33
- version: 2.5.18.013
32
+ - 14
33
+ version: 2.5.18.014
34
34
  type: :runtime
35
35
  version_requirements: *id001
36
36
  description: " This project provides libraries of Capistrano tasks and extensions to \n remove the repetative manual work associated with installing services \n on linux servers.\n"