fix: Change salt's logrotate config file
This commit is contained in:
committed by
Carlos D. Álvaro
parent
bc4c65559f
commit
5ed81c554e
@@ -556,8 +556,11 @@ function initialize_datadir()
|
|||||||
function configure_logrotate()
|
function configure_logrotate()
|
||||||
{
|
{
|
||||||
log_info "Configuring logrotate ..."
|
log_info "Configuring logrotate ..."
|
||||||
|
local LOGROTATE_CONFIG_DIR='/etc/logrotate.d/salt'
|
||||||
|
local LOGROTATE_CONFIG_FILE="${LOGROTATE_CONFIG_DIR}/salt-common.logrotate"
|
||||||
|
|
||||||
rm -f /etc/logrotate.d/salt-common
|
rm -rf "${LOGROTATE_CONFIG_DIR}"
|
||||||
|
mkdir -p "${LOGROTATE_CONFIG_DIR}"
|
||||||
|
|
||||||
# configure supervisord log rotation
|
# configure supervisord log rotation
|
||||||
cat > /etc/logrotate.d/supervisord <<EOF
|
cat > /etc/logrotate.d/supervisord <<EOF
|
||||||
@@ -573,13 +576,14 @@ ${SALT_LOGS_DIR}/supervisor/*.log {
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
# configure salt master, minion and key log rotation
|
# configure salt master, minion and key log rotation
|
||||||
cat > /etc/logrotate.d/salt <<EOF
|
cat > "${LOGROTATE_CONFIG_FILE}" <<EOF
|
||||||
${SALT_LOGS_DIR}/salt/master.log {
|
${SALT_LOGS_DIR}/salt/master.log {
|
||||||
${SALT_LOG_ROTATE_FREQUENCY}
|
${SALT_LOG_ROTATE_FREQUENCY}
|
||||||
missingok
|
missingok
|
||||||
rotate ${SALT_LOG_ROTATE_RETENTION}
|
rotate ${SALT_LOG_ROTATE_RETENTION}
|
||||||
compress
|
compress
|
||||||
notifempty
|
notifempty
|
||||||
|
create 0640 ${SALT_USER} ${SALT_USER}
|
||||||
}
|
}
|
||||||
|
|
||||||
${SALT_LOGS_DIR}/salt/key.log {
|
${SALT_LOGS_DIR}/salt/key.log {
|
||||||
@@ -588,20 +592,23 @@ ${SALT_LOGS_DIR}/salt/key.log {
|
|||||||
rotate ${SALT_LOG_ROTATE_RETENTION}
|
rotate ${SALT_LOG_ROTATE_RETENTION}
|
||||||
compress
|
compress
|
||||||
notifempty
|
notifempty
|
||||||
|
create 0640 ${SALT_USER} ${SALT_USER}
|
||||||
}
|
}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [[ "${SALT_API_SERVICE_ENABLED,,}" == true ]]; then
|
if [[ "${SALT_API_SERVICE_ENABLED,,}" == true ]]; then
|
||||||
# configure salt-api log rotation
|
# configure salt-api log rotation
|
||||||
cat >> /etc/logrotate.d/salt <<EOF
|
cat >> "${LOGROTATE_CONFIG_FILE}" <<EOF
|
||||||
|
|
||||||
${SALT_LOGS_DIR}/salt/api.log {
|
${SALT_LOGS_DIR}/salt/api.log {
|
||||||
${SALT_LOG_ROTATE_FREQUENCY}
|
${SALT_LOG_ROTATE_FREQUENCY}
|
||||||
missingok
|
missingok
|
||||||
rotate ${SALT_LOG_ROTATE_RETENTION}
|
rotate ${SALT_LOG_ROTATE_RETENTION}
|
||||||
compress
|
compress
|
||||||
notifempty
|
notifempty
|
||||||
|
create 0640 ${SALT_USER} ${SALT_USER}
|
||||||
}
|
}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user