Side by Side Diff: modules/adblockplus/templates/log/rotation.erb
Issue 29338680:
Issue 3825 - Replace Logstash setup with Fluentd (Closed)
Patch Set:
Created March 18, 2016, 6:12 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/templates/log/fluentd/master.conf.erb ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 # Puppet: Adblockplus::Log::Rotation['<%= @title %>'] | 1 # Puppet: Adblockplus::Log::Rotation['<%= @title %>'] |
| 2 <%= @path %> { | 2 <%= @path %> { |
| 3 <%= @interval %> | 3 <%= @interval %> |
| 4 compress | 4 compress |
| 5 missingok | 5 missingok |
| 6 nodateext | 6 nodateext |
| 7 rotate <%= @count.to_i %> | 7 rotate <%= @count.to_i %> |
| 8 sharedscripts | 8 sharedscripts |
| 9 shred | 9 shred |
| 10 <% unless @postrotate.empty? -%> | 10 <% unless @postrotate.empty? -%> |
| 11 postrotate | 11 postrotate |
| 12 <%= @postrotate.join("\n ") rescue @postrotate %> | 12 <%= @postrotate.join("\n ") rescue @postrotate %> |
| 13 endscript | 13 endscript |
| 14 <% end -%> | 14 <% end -%> |
| 15 <% if @upload -%> | |
| 16 lastaction | |
| 17 <%= scope.function_shellquote([ | |
| 18 "ssh", "-i", "/etc/ssh/ssh_host_rsa_key", | |
| 19 scope.function_hiera("adblockplus::log::uplink", "localhost"), | |
| 20 @name, | |
| 21 ]) %> < <%= @path %>.1.gz | |
| 22 endscript | |
| 23 <% end -%> | |
| 24 } | 15 } |
| OLD | NEW |
« no previous file with comments
|
« modules/adblockplus/templates/log/fluentd/master.conf.erb ('k')
|
no next file »
|
no next file with comments »
