From 55a6cd43c6b51f9d57a89093ebe2cd9e06d7b5d4 Mon Sep 17 00:00:00 2001 From: Norman Dankert Date: Fri, 22 Nov 2024 22:21:18 +0100 Subject: [PATCH] stubby: ensure appdata directory is present on service start Signed-off-by: Norman Dankert --- net/stubby/Makefile | 2 +- net/stubby/files/stubby.init | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net/stubby/Makefile b/net/stubby/Makefile index d86630b844a2a..d7a0c77e89d13 100644 --- a/net/stubby/Makefile +++ b/net/stubby/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stubby PKG_VERSION:=0.4.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME) diff --git a/net/stubby/files/stubby.init b/net/stubby/files/stubby.init index 5742905002028..d30fcf0b03727 100755 --- a/net/stubby/files/stubby.init +++ b/net/stubby/files/stubby.init @@ -11,6 +11,7 @@ stubby_config_dir="/var/etc/stubby" stubby_config="$stubby_config_dir/stubby.yml" stubby_pid_file="/var/run/stubby.pid" stubby_manual_config="/etc/stubby/stubby.yml" +stubby_default_appdata_dir="/var/lib/stubby" boot() { @@ -49,7 +50,7 @@ generate_config() config_get round_robin "global" round_robin_upstreams "1" echo "round_robin_upstreams: $round_robin" - config_get appdata_dir "global" appdata_dir "/var/lib/stubby" + config_get appdata_dir "global" appdata_dir "$stubby_default_appdata_dir" echo "appdata_dir: \"$appdata_dir\"" config_get trust_anchors_backoff_time "global" trust_anchors_backoff_time "2500" @@ -211,6 +212,7 @@ start_service() { local manual local log_level local command_line_arguments + local appdata_dir mkdir -p "$stubby_config_dir" @@ -228,6 +230,14 @@ start_service() { chown stubby:stubby "$stubby_config" chmod 0400 "$stubby_config" + config_get appdata_dir "global" appdata_dir "$stubby_default_appdata_dir" + if [ -n "$appdata_dir" ]; then + if mkdir -p "$appdata_dir"; then + chown stubby:stubby "$appdata_dir" + chmod 0700 "$appdata_dir" + fi + fi + config_get command_line_arguments "global" command_line_arguments "" config_get log_level "global" log_level ""