🔨 Migrate old-style S6 scripts to s6-rc.d (#269)

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Configures NGINX for use with TasmoAdmin

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type

@@ -0,0 +1 @@
+oneshot

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-nginx/run

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/init-tasmoadmin/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Configures TasmoAdmin

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/init-tasmoadmin/type

@@ -0,0 +1 @@
+oneshot

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/init-tasmoadmin/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-tasmoadmin/run

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish

@@ -0,0 +1,26 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: TasmoAdmin
+# 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

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/nginx/run

@@ -3,7 +3,9 @@
 # Home Assistant Community Add-on: TasmoAdmin
 # Runs the Nginx daemon
 # ==============================================================================
+
 # Wait for PHP-FPM to become available
 bashio::net.wait_for 9001
+
 bashio::log.info "Starting NGINX server..."
 exec nginx -g "daemon off;"

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/nginx/type

@@ -0,0 +1 @@
+longrun

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/finish

@@ -0,0 +1,27 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: TasmoAdmin
+# Take down the S6 supervision tree when PHP FPM 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="PHP-FPM"
+
+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

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: TasmoAdmin
 # Runs the PHP-FPM daemon

tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/type

@@ -0,0 +1 @@
+longrun

tasmoadmin/rootfs/etc/services.d/nginx/finish

@@ -1,11 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Home Assistant Community Add-on: TasmoAdmin
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
-  bashio::log.warning "NGINX crashed, halting add-on"
-  /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "NGINX stopped, restarting..."

tasmoadmin/rootfs/etc/services.d/php-fpm/finish

@@ -1,11 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Home Assistant Community Add-on: TasmoAdmin
-# Take down the S6 supervision tree when PHP FPM fails
-# ==============================================================================
-if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
-  bashio::log.warning "PHP-FPM crashed, halting add-on"
-  /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "PHP-FPM stopped, restarting..."