Side by Side Diff: modules/fail2ban/templates/jail.erb
Issue 29371558:
Issue 4701 - Use of array for compatibility with pupet 2 and 3 (Closed)
Patch Set:
Created Jan. 11, 2017, 4:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
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 <% @jails.each do |name, config| -%> | 1 <% @jails.each do |name, config| -%> |
| 2 <% if !config['logpath'].empty? -%> | 2 <% if !config['logpath'].empty? -%> |
| 3 [<%= name %>] | 3 [<%= name %>] |
| 4 <% if config['filter'].empty? -%> | 4 <% if config['filter'].empty? -%> |
| 5 filter = <%= name %> | 5 filter = <%= name %> |
| 6 <% end -%> | 6 <% end -%> |
| 7 <% configuration = scope.function_merge(@jail_default, config) -%> | 7 <% configuration = scope.function_merge([@jail_default, config]) -%> |
| 8 <% configuration.each do |key, value| -%> | 8 <% configuration.each do |key, value| -%> |
| 9 <%= key %> = <%= value %> | 9 <%= key %> = <%= value %> |
| 10 <% end %> | 10 <% end %> |
| 11 <% else -%> | 11 <% else -%> |
| 12 <% raise Puppet::Error, "Log path missing from configuration" -%> | 12 <% raise Puppet::Error, "Log path missing from configuration" -%> |
| 13 <% end -%> | 13 <% end -%> |
| 14 <% end -%> | 14 <% end -%> |
| 15 | 15 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
