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

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

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Sets up Grocy before the server starts

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

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

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

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

grocy/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: Grocy
 # Configures NGINX for use with Grocy

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

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

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

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

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

@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: Grocy
 # Configures PHP-FPM for use with Grocy
@@ -10,8 +11,8 @@ bashio::var.json \
     port "^9002" \
     base "$(bashio::addon.ingress_entry)" \
     | tempio \
-        -template /etc/php8/templates/php-fpm.gtpl \
+        -template /etc/php81/templates/php-fpm.gtpl \
-        -out /etc/php8/php-fpm.d/ingress.conf
+        -out /etc/php81/php-fpm.d/ingress.conf
 
 # Generate direct access configuration, if enabled.
 if bashio::var.has_value "$(bashio::addon.port 80)"; then
@@ -19,6 +20,6 @@ if bashio::var.has_value "$(bashio::addon.port 80)"; then
         name "www" \
         port "^9001" \
         | tempio \
-            -template /etc/php8/templates/php-fpm.gtpl \
+            -template /etc/php81/templates/php-fpm.gtpl \
-            -out /etc/php8/php-fpm.d/www.conf
+            -out /etc/php81/php-fpm.d/www.conf
 fi

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

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

grocy/rootfs/etc/s6-overlay/s6-rc.d/init-php-fpm/up

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

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

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

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

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

grocy/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: Grocy
+# 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

grocy/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: Grocy
 # Runs the PHP-FPM daemon
@@ -89,4 +90,4 @@ GROCY_CULTURE=$(bashio::config "culture")
 GROCY_CURRENCY=$(bashio::config "currency")
 GROCY_ENTRY_PAGE=$(bashio::config 'entry_page')
 
-exec php-fpm8 -R --nodaemonize
+exec php-fpm81 -R --nodaemonize

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

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

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

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

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

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