This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via c9dbf671d408c4af1ffab606e3598c149def5df7 (commit) via 55f0bafb7b3f4880d335cc7392dfa23aa550aa75 (commit) via 839451c527ddb4563a3ea2361e012e405a5b11a2 (commit) from ceb5733c595b99c3f23e1c0b18cd315babb6afeb (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit c9dbf671d408c4af1ffab606e3598c149def5df7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 2 09:45:04 2021 +0000
core158: Ship perl files with changed permissions
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 55f0bafb7b3f4880d335cc7392dfa23aa550aa75 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Jun 1 22:23:59 2021 +0200
configroot: prevent any Perl file within /var/ipfire/ from being owned by nobody
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 839451c527ddb4563a3ea2361e012e405a5b11a2 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 1 11:39:09 2021 +0200
dnsdist: Improve initscript to prevent reload on config error
start, restart and reload will now be prohibited if the configuration file has an incorrect syntax. This avoids killing a running daemon and is showing an indication to the user instead of having the daemon dying silently in the background.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/158/filelists/files | 8 ++++++++ lfs/configroot | 4 ++-- lfs/dnsdist | 2 +- src/initscripts/packages/dnsdist | 22 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/158/filelists/files b/config/rootfiles/core/158/filelists/files index 385056dcd..f2512a9e9 100644 --- a/config/rootfiles/core/158/filelists/files +++ b/config/rootfiles/core/158/filelists/files @@ -8,3 +8,11 @@ srv/web/ipfire/cgi-bin/traffic.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/images/apple.png var/ipfire/backup/bin/backup.pl +var/ipfire/countries.pl +var/ipfire/general-functions.pl +var/ipfire/graphs.pl +var/ipfire/header.pl +var/ipfire/ids-functions.pl +var/ipfire/lang.pl +var/ipfire/location-functions.pl +var/ipfire/modem-lib.pl diff --git a/lfs/configroot b/lfs/configroot index 2ab9cc29b..02b2883ba 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -169,7 +169,7 @@ $(TARGET) : # Configroot permissions chown -R nobody:nobody $(CONFIG_ROOT) chown root:root $(CONFIG_ROOT) - for i in backup/ header.pl general-functions.pl graphs.pl lang.pl addon-lang/ langs/ ; do \ + for i in backup/ *.pl addon-lang/ langs/ ; do \ chown -R root:root $(CONFIG_ROOT)/$$i; \ done chown -Rv root:root $(CONFIG_ROOT)/*/bin diff --git a/lfs/dnsdist b/lfs/dnsdist index 3c30b4213..b93a4fc36 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 PROG = dnsdist -PAK_VER = 8 +PAK_VER = 9
DEPS =
diff --git a/src/initscripts/packages/dnsdist b/src/initscripts/packages/dnsdist index c94f429ab..35cc3c653 100644 --- a/src/initscripts/packages/dnsdist +++ b/src/initscripts/packages/dnsdist @@ -11,8 +11,22 @@
[ -r "/etc/sysconfig/dnsdist" ] && . /etc/sysconfig/dnsdist
+check_config() { + if ! /usr/bin/dnsdist --check-config >/dev/null; then + boot_mesg "dnsdist configuration file contains errors" "${FAILURE}" + echo_failure + return 1 + fi + + return 0 +} + case "${1}" in start) + if ! check_config; then + exit 1 + fi + boot_mesg "Starting dnsdist..."
# Increasing maximum number of open files @@ -29,11 +43,19 @@ case "${1}" in ;;
reload) + if ! check_config; then + exit 1 + fi + boot_mesg "Reloading dnsdist..." reloadproc /usr/bin/dnsdist ;;
restart) + if ! check_config; then + exit 1 + fi + ${0} stop sleep 1 ${0} start
hooks/post-receive -- IPFire 2.x development tree