From: Ryan Keane Date: Sun, 22 Dec 2024 14:12:04 +0000 (-0800) Subject: adguardhome: Update init files X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c3a33e10a5cb4fb01c35739f58281146015e7351;p=feed%2Fpackages.git adguardhome: Update init files Move working directory from `/var/adguardhome` to `/var/lib/adguardhome`, according to Linux FHS. Add option to store PID file, defaulting to `/run/adguardhome.pid`. Signed-off-by: Ryan Keane --- diff --git a/net/adguardhome/files/adguardhome.config b/net/adguardhome/files/adguardhome.config index 0c2aeac0ab..7a8a417d04 100644 --- a/net/adguardhome/files/adguardhome.config +++ b/net/adguardhome/files/adguardhome.config @@ -1,4 +1,5 @@ config adguardhome config - # Where to store persistent data by AdGuard Home - option workdir /var/adguardhome option config /etc/adguardhome.yaml + # Where to store persistent data by AdGuard Home + option workdir /var/lib/adguardhome + option pidfile /run/adguardhome.pid diff --git a/net/adguardhome/files/adguardhome.init b/net/adguardhome/files/adguardhome.init index ffdae9c43d..328ce693d0 100644 --- a/net/adguardhome/files/adguardhome.init +++ b/net/adguardhome/files/adguardhome.init @@ -21,13 +21,14 @@ start_service() { fi config_load adguardhome - config_get WORK_DIR config workdir config_get CONFIG_FILE config config "/etc/adguardhome.yaml" + config_get PID_FILE config pidfile "/run/adguardhome.pid" + config_get WORK_DIR config workdir "/var/lib/adguardhome" [ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR" procd_open_instance - procd_set_param command "$PROG" -c "$CONFIG_FILE" -w "$WORK_DIR" --no-check-update + procd_set_param command "$PROG" -c "$CONFIG_FILE" -w "$WORK_DIR" --pidfile "$PID_FILE" --no-check-update procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance