Merge pull request #1362 from MichaIng/patch-1

Fix errors on logging configuration
This commit is contained in:
4s3ti 2021-10-11 15:40:22 +02:00 committed by GitHub
commit 090642fd7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2151,10 +2151,13 @@ confNetwork(){
} }
confLogging() { confLogging() {
# Pre-create rsyslog/logrotate config directories if missing, to assure logs are handled as expected when those are installed at a later time
$SUDO mkdir -p etc/{rsyslog,logrotate}.d
echo "if \$programname == 'ovpn-server' then /var/log/openvpn.log echo "if \$programname == 'ovpn-server' then /var/log/openvpn.log
if \$programname == 'ovpn-server' then stop" | $SUDO tee /etc/rsyslog.d/30-openvpn.conf > /dev/null if \$programname == 'ovpn-server' then stop" | $SUDO tee /etc/rsyslog.d/30-openvpn.conf > /dev/null
echo "/var/log/openvpn.log echo "/var/log/openvpn.log
{ {
rotate 4 rotate 4
weekly weekly
@ -2171,7 +2174,7 @@ if \$programname == 'ovpn-server' then stop" | $SUDO tee /etc/rsyslog.d/30-openv
# Restart the logging service # Restart the logging service
case ${PLAT} in case ${PLAT} in
Debian|Raspbian|Ubuntu) Debian|Raspbian|Ubuntu)
$SUDO systemctl restart rsyslog.service || true $SUDO systemctl -q is-active rsyslog.service && $SUDO systemctl restart rsyslog.service
;; ;;
esac esac
} }