From d97b2e7d4a6ed524fc9eb5f11c523e12576c2ff3 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 10 Oct 2022 22:14:57 +0100 Subject: [PATCH] Make init more consistent with s6v3 standard --- .../{init-qbittorrent => init-qbittorrent-config} | 0 .../dependencies.d/init-config | 0 .../s6-rc.d/{init-qbittorrent => init-qbittorrent-config}/run | 3 ++- .../s6-rc.d/{init-qbittorrent => init-qbittorrent-config}/type | 0 root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up | 1 + root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up | 1 - root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run | 2 +- root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent | 0 .../contents.d/init-qbittorrent-config} | 0 9 files changed, 4 insertions(+), 3 deletions(-) rename root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/{init-qbittorrent => init-qbittorrent-config} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-qbittorrent => init-qbittorrent-config}/dependencies.d/init-config (100%) rename root/etc/s6-overlay/s6-rc.d/{init-qbittorrent => init-qbittorrent-config}/run (87%) rename root/etc/s6-overlay/s6-rc.d/{init-qbittorrent => init-qbittorrent-config}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent rename root/etc/s6-overlay/s6-rc.d/{svc-qbittorrent/dependencies.d/init-qbittorrent => user/contents.d/init-qbittorrent-config} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-qbittorrent-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/dependencies.d/init-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-qbittorrent/dependencies.d/init-config rename to root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/dependencies.d/init-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/run b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run similarity index 87% rename from root/etc/s6-overlay/s6-rc.d/init-qbittorrent/run rename to root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run index 377bea6..ea8294b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/run +++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run @@ -4,8 +4,9 @@ mkdir -p /config/qBittorrent # copy default config -[[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \ +if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf +fi # chown download directory if currently not set to abc if [[ -d /downloads ]]; then diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/type b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-qbittorrent/type rename to root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up new file mode 100644 index 0000000..2b1e798 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up b/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up deleted file mode 100644 index 5f761a2..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-qbittorrent/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-qbittorrent/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run index 807f419..111e248 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run @@ -3,5 +3,5 @@ WEBUI_PORT=${WEBUI_PORT:-8080} exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 ${WEBUI_PORT}" \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \ s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-qbittorrent b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/dependencies.d/init-qbittorrent rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-qbittorrent-config