From f73c92d03bd4c9df9c3e7c2d0da5c28bb17a1746 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 9 Nov 2022 17:51:07 +0000 Subject: [PATCH] rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script Signed-off-by: Adam Warner --- .../etc/s6-overlay/s6-rc.d/_gravityonboot/up | 2 -- .../dependencies.d/lighttpd | 0 .../dependencies.d/pihole-FTL | 0 .../s6-rc.d/{_gravityonboot => _postFTL}/type | 0 .../debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up | 2 ++ .../etc/s6-overlay/s6-rc.d/_startup/dependencies | 1 - .../user/contents.d/{_gravityonboot => _postFTL} | 0 .../usr/local/bin/{_gravityonboot.sh => _postFTL.sh} | 12 +++++++++++- src/s6/debian-root/usr/local/bin/_startup.sh | 3 --- src/s6/debian-root/usr/local/bin/bash_functions.sh | 3 --- 10 files changed, 13 insertions(+), 10 deletions(-) delete mode 100755 src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{_gravityonboot => _postFTL}/dependencies.d/lighttpd (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{_gravityonboot => _postFTL}/dependencies.d/pihole-FTL (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{_gravityonboot => _postFTL}/type (100%) create mode 100755 src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up delete mode 100644 src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/dependencies rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/{_gravityonboot => _postFTL} (100%) rename src/s6/debian-root/usr/local/bin/{_gravityonboot.sh => _postFTL.sh} (71%) diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up deleted file mode 100755 index d61fc03..0000000 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -background { bash -e /usr/local/bin/_gravityonboot.sh } \ No newline at end of file diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies.d/lighttpd b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/dependencies.d/lighttpd similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies.d/lighttpd rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/dependencies.d/lighttpd diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies.d/pihole-FTL b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/dependencies.d/pihole-FTL similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies.d/pihole-FTL rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/dependencies.d/pihole-FTL diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/type b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/type similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/type rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/type diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up new file mode 100755 index 0000000..4d5d13d --- /dev/null +++ b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up @@ -0,0 +1,2 @@ +#!/command/execlineb +background { bash -e /usr/local/bin/_postFTL.sh } \ No newline at end of file diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/dependencies b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/dependencies deleted file mode 100644 index fd10531..0000000 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/dependencies +++ /dev/null @@ -1 +0,0 @@ -_uid-gid-changer \ No newline at end of file diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_gravityonboot b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_postFTL similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_gravityonboot rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_postFTL diff --git a/src/s6/debian-root/usr/local/bin/_gravityonboot.sh b/src/s6/debian-root/usr/local/bin/_postFTL.sh similarity index 71% rename from src/s6/debian-root/usr/local/bin/_gravityonboot.sh rename to src/s6/debian-root/usr/local/bin/_postFTL.sh index a238bb6..b06cff5 100755 --- a/src/s6/debian-root/usr/local/bin/_gravityonboot.sh +++ b/src/s6/debian-root/usr/local/bin/_postFTL.sh @@ -1,4 +1,5 @@ #!/bin/bash +# This script contains function calls and lines that may rely on pihole-FTL to be running, it is run as part of a oneshot service on container startup if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then set -x ; @@ -20,4 +21,13 @@ if [ -z "$SKIPGRAVITYONBOOT" ] || [ ! -f "${gravityDBfile}" ]; then pihole -g else echo " Skipping Gravity Database Update." -fi \ No newline at end of file +fi + +# Run update checker to check for newer container, and display version output +echo "" +pihole updatechecker +pihole -v + +DOCKER_TAG=$(cat /pihole.docker.tag) +echo " Container tag is: ${DOCKER_TAG}" +echo "" \ No newline at end of file diff --git a/src/s6/debian-root/usr/local/bin/_startup.sh b/src/s6/debian-root/usr/local/bin/_startup.sh index a133b3c..4f27f24 100755 --- a/src/s6/debian-root/usr/local/bin/_startup.sh +++ b/src/s6/debian-root/usr/local/bin/_startup.sh @@ -69,9 +69,6 @@ test_configs echo " [i] Docker start setup complete" echo "" -pihole -v -echo " Container tag is: ${PIHOLE_DOCKER_TAG}" -echo "" echo " [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}" echo "" diff --git a/src/s6/debian-root/usr/local/bin/bash_functions.sh b/src/s6/debian-root/usr/local/bin/bash_functions.sh index 69d7838..85ff87e 100644 --- a/src/s6/debian-root/usr/local/bin/bash_functions.sh +++ b/src/s6/debian-root/usr/local/bin/bash_functions.sh @@ -100,9 +100,6 @@ ensure_basic_configuration() { chown pihole:root "${PI_HOLE_BIN_DIR}/pihole" set -e - # Update version numbers - pihole updatechecker - pihole updatechecker remote # Re-write all of the setupVars to ensure required ones are present (like QUERY_LOGGING) # If the setup variable file exists,