Skip to content
Snippets Groups Projects
Verified Commit 63278936 authored by Jan Pavlinec's avatar Jan Pavlinec
Browse files

resolver-debug: redirect resolver logs to /var/log/resolver

All resolvers logs (unbound/kresd) will end in /var/log/resolver file
until package resolver-debug is  uninstalled
parent f64bedbe
Branches
Tags
2 merge requests!824Turris OS 5.3 (HBK),!731resolver-debug: redirect resolver logs to /tmp/log/resolver
#
# Copyright (C) 2017-2020 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
# Copyright (C) 2017-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
......@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=resolver-debug
PKG_VERSION:=0.0.1
PKG_RELEASE:=10
PKG_VERSION:=0.0.2
PKG_RELEASE:=1
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0
......@@ -21,12 +21,14 @@ define Package/resolver-debug
CATEGORY:=Network
SUBMENU:=IP Addresses and Names
TITLE:=Resolver debug utils
DEPENDS:=+luci-app-commands
DEPENDS:=+luci-app-commands +logrotate +syslog-ng
endef
define Package/resolver-debug/description
Debug utils for knot-resolver and unbound.
It adds custom commands for debugging to LuCI.
It adds custom commands for debugging to LuCI
and redirects resolver log from /var/log/messages
to /var/log/resolver
endef
Build/Compile:=:
......@@ -35,6 +37,12 @@ Build/Install:=:
define Package/resolver-debug/install
$(INSTALL_DIR) $(1)/etc/resolver
$(INSTALL_BIN) ./files/resolver-debug.sh $(1)/etc/resolver/resolver-debug.sh
$(INSTALL_DIR) $(1)/usr/share/syslog-ng/include/scl/resolver
$(CP) ./files/syslog/resolver.conf $(1)/usr/share/syslog-ng/include/scl/resolver/
$(INSTALL_DIR) $(1)/etc/logrotate.d
$(CP) ./files/logrotate/resolver.conf $(1)/etc/logrotate.d/
endef
define Package/resolver-debug/postinst
......@@ -42,6 +50,7 @@ define Package/resolver-debug/postinst
if [ -z "$$IPKG_INSTROOT" ]; then
/etc/resolver/resolver-debug.sh remove-btn
/etc/resolver/resolver-debug.sh add-btn
/etc/init.d/syslog-ng reload
fi
endef
......@@ -52,4 +61,11 @@ if [ -z "$$IPKG_INSTROOT" ]; then
fi
endef
define Package/resolver-debug/postrm
#!/bin/sh
if [ -z "$$IPKG_INSTROOT" ]; then
/etc/init.d/syslog-ng reload
fi
endef
$(eval $(call BuildPackage,resolver-debug))
/var/log/resolver {
size 10M
rotate 1
postrotate
/etc/init.d/syslog-ng reload
endscript
}
......@@ -164,7 +164,7 @@ print_log() {
echo "====Log===="
date
echo "==========="
cat /var/log/messages
cat /var/log/resolver
}
......
destination resolver{
file("/var/log/resolver");
};
filter f_resolver{
program("unbound") or program("kresd") or program("resolver-debug");
};
log {
source(src);
filter(f_resolver);
destination(resolver);
flags(final);
};
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment