chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix selecting salt logs for logrotate

Browse Source
This commit is contained in:
Carlos Álvaro
2019-01-06 13:08:24 +01:00
parent 855589c19e
commit b33e12a647
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
assets/runtime/functions.sh
View File

@@ -202,9 +202,7 @@ function configure_logrotate()
{ {
echo "Configuring logrotate ..." echo "Configuring logrotate ..."
if [[ -f /etc/logrotate.d/salt-common ]]; then rm -f /etc/logrotate.d/salt-common
rm /etc/logrotate.d/salt-common
fi
# configure supervisord log rotation # configure supervisord log rotation
cat > /etc/logrotate.d/supervisord <<EOF cat > /etc/logrotate.d/supervisord <<EOF
@@ -219,16 +217,30 @@ ${SALT_LOGS_DIR}/supervisor/*.log {
} }
EOF EOF
# configure salt-master log rotation # configure salt master, minion and key log rotation
cat > /etc/logrotate.d/salt <<EOF cat > /etc/logrotate.d/salt <<EOF
${SALT_LOGS_DIR}/salt/* { ${SALT_LOGS_DIR}/salt/master {
${SALT_LOG_ROTATE_FREQUENCY}
missingok
rotate ${SALT_LOG_ROTATE_RETENTION}
compress
notifempty
}
${SALT_LOGS_DIR}/salt/minion {
${SALT_LOG_ROTATE_FREQUENCY}
missingok
rotate ${SALT_LOG_ROTATE_RETENTION}
compress
notifempty
}
${SALT_LOGS_DIR}/salt/key {
${SALT_LOG_ROTATE_FREQUENCY} ${SALT_LOG_ROTATE_FREQUENCY}
missingok missingok
rotate ${SALT_LOG_ROTATE_RETENTION} rotate ${SALT_LOG_ROTATE_RETENTION}
compress compress
delaycompress
notifempty notifempty
copytruncate
} }
EOF EOF
} }