Browse Source

Merge "Enable to modify params of logrotate-crond.conf" into stable/train

changes/72/741572/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
1f8f4d9757
2 changed files with 13 additions and 1 deletions
  1. +10
    -0
      manifests/profile/base/logging/logrotate.pp
  2. +3
    -1
      templates/logrotate/containers_logrotate.conf.erb

+ 10
- 0
manifests/profile/base/logging/logrotate.pp View File

@@ -62,10 +62,18 @@
# (optional) Defaults to True.
# Configures the logrotate compress parameter.
#
# [*minsize*]
# (optional) Defaults to '1'.
# Configures the logrotate minsize parameter.
#
# [*maxsize*]
# (optional) Defaults to '10M'.
# Configures the logrotate maxsize parameter.
#
# [*notifempty*]
# (optional) Defaults to True.
# Configures the logrotate notifempty parameter.
#
# [*rotation*]
# (optional) Defaults to 'daily'.
# Configures the logrotate rotation interval.
@@ -111,7 +119,9 @@ class tripleo::profile::base::logging::logrotate (
$delaycompress = true,
$compress = true,
$rotation = 'daily',
$minsize = 1,
$maxsize = '10M',
$notifempty = true,
$rotate = 14,
$purge_after_days = 14,
$dateext = undef,


+ 3
- 1
templates/logrotate/containers_logrotate.conf.erb View File

@@ -4,12 +4,14 @@
maxage <%= @purge_after_days %>
# minsize 1 is required for GDPR compliance, all files in
# /var/log/containers not managed with logrotate will be purged!
minsize 1
minsize <%= @minsize %>
# Do not use size as it's not compatible with time-based rotation rules
# required for GDPR compliance.
maxsize <%= @maxsize %>
missingok
<%- if @notifempty %>
notifempty
<%- end %>
<%- if @copytruncate %>
copytruncate
<%- end %>


Loading…
Cancel
Save