Skip to content

Commit

Permalink
Merge pull request #83 from cliff-wakefield/global_dateyesterday
Browse files Browse the repository at this point in the history
Allowed dateyesterday at the global level
  • Loading branch information
alexjfisher authored Oct 30, 2017
2 parents 741002b + bff4afc commit 2f17473
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions manifests/conf.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
Optional[String] $create_group = undef,
Optional[Boolean] $dateext = undef,
Optional[String] $dateformat = undef,
Optional[Boolean] $dateyesterday = undef,
Optional[Boolean] $delaycompress = undef,
Optional[String] $extension = undef,
Optional[Boolean] $ifempty = undef,
Expand Down
2 changes: 1 addition & 1 deletion spec/defines/conf_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
end

# Boolean Flag values
%w[compress copy copytruncate create dateext delaycompress ifempty missingok sharedscripts shred].each do |param|
%w[compress copy copytruncate create dateext delaycompress ifempty missingok sharedscripts shred dateyesterday].each do |param|
it_behaves_like 'boolean flag', param, param != 'create'
end

Expand Down
2 changes: 1 addition & 1 deletion templates/etc/logrotate.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
end

%w(compress copy copytruncate delaycompress
dateext missingok sharedscripts shred).each do |bool_opt|
dateext missingok sharedscripts shred dateyesterday).each do |bool_opt|
if (scope.to_hash.has_key?(bool_opt) && scope.to_hash[bool_opt] != nil)
opts << (scope.to_hash[bool_opt] == true ? '':'no') + bool_opt
end
Expand Down

0 comments on commit 2f17473

Please sign in to comment.