Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔨 Migrate old-style base scripts s6-rc #375

Merged
merged 1 commit into from
Dec 11, 2022
Merged

🔨 Migrate old-style base scripts s6-rc #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/adguard/dependencies.d/init-adguard
View file
Open in desktop
Empty file.
27 changes: 27 additions & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/adguard/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: AdGuard Home
# Take down the S6 supervision tree when Adguard Home fails
# ==============================================================================
declare exit_code
readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
readonly exit_code_service="${1}"
readonly exit_code_signal="${2}"
readonly service="Adguard Home"

bashio::log.info \
"Service ${service} exited with code ${exit_code_service}" \
"(by signal ${exit_code_signal})"

if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
fi
[[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
fi
exec /run/s6/basedir/bin/halt
fi
3 changes: 2 additions & 1 deletion adguard/rootfs/etc/services.d/adguard/run → ...rootfs/etc/s6-overlay/s6-rc.d/adguard/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: AdGuard Home
# Runs the AdGuard Home server
Expand All @@ -13,7 +14,7 @@ options+=(--work-dir /data/adguard)
options+=(--no-check-update)

if bashio::debug; then
option+=(--verbose)
option+=(--verbose)
fi

# RUN AdGuard Home server
Expand Down
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/adguard/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/adguard
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions adguard/rootfs/etc/cont-init.d/discovery.sh → ...otfs/etc/s6-overlay/s6-rc.d/discovery/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: AdGuard Home
# Sends discovery information to Home Assistant.
# ==============================================================================
declare config

# Wait for AdGuard Home to become available
bashio::net.wait_for 45158 127.0.0.1 300

config=$(\
bashio::var.json \
host "127.0.0.1" \
Expand Down
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/discovery/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/discovery/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/discovery/run
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/init-adguard/dependencies.d/base
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions adguard/rootfs/etc/cont-init.d/adguard.sh → ...s/etc/s6-overlay/s6-rc.d/init-adguard/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# shellcheck disable=SC2207
# ==============================================================================
# Home Assistant Community Add-on: AdGuard Home
Expand Down
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/init-adguard/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/init-adguard/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-adguard/run
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions adguard/rootfs/etc/cont-init.d/nginx.sh → ...tfs/etc/s6-overlay/s6-rc.d/init-nginx/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: AdGuard Home
# Configures NGINX for use with the AdGuard Home server
Expand Down
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-nginx/run
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/adguard
View file
Open in desktop
Empty file.
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
View file
Open in desktop
Empty file.
26 changes: 26 additions & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: AdGuard Home
# Take down the S6 supervision tree when Nginx fails
# ==============================================================================
declare exit_code
readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
readonly exit_code_service="${1}"
readonly exit_code_signal="${2}"
readonly service="NGINX"

bashio::log.info \
"Service ${service} exited with code ${exit_code_service}" \
"(by signal ${exit_code_signal})"

if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
fi
[[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
fi
exec /run/s6/basedir/bin/halt
fi
0 adguard/rootfs/etc/services.d/nginx/run → ...d/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions adguard/rootfs/etc/s6-overlay/s6-rc.d/nginx/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/adguard
View file
Open in desktop
Empty file.
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery
View file
Open in desktop
Empty file.
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-adguard
View file
Open in desktop
Empty file.
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
View file
Open in desktop
Empty file.
Empty file added adguard/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
View file
Open in desktop
Empty file.
11 changes: 0 additions & 11 deletions adguard/rootfs/etc/services.d/nginx/finish
View file
Open in desktop

This file was deleted.