From 92f2f980585c6f22285729f31dbc4ea6ca1b3c31 Mon Sep 17 00:00:00 2001
From: Magicalex <magicalex@mondedie.fr>
Date: Tue, 16 Mar 2021 21:17:16 +0100
Subject: [PATCH] fix(): s6 service

---
 rootfs/{services => etc/s6.d}/.s6-svscan/crash  | 0
 rootfs/{services => etc/s6.d}/.s6-svscan/finish | 0
 rootfs/etc/s6.d/nginx/crash                     | 2 ++
 rootfs/etc/s6.d/nginx/finish                    | 2 ++
 rootfs/{services => etc/s6.d}/nginx/run         | 0
 rootfs/etc/s6.d/php8/crash                      | 2 ++
 rootfs/etc/s6.d/php8/finish                     | 2 ++
 rootfs/{services => etc/s6.d}/php8/run          | 0
 rootfs/usr/local/bin/startup                    | 2 +-
 9 files changed, 9 insertions(+), 1 deletion(-)
 rename rootfs/{services => etc/s6.d}/.s6-svscan/crash (100%)
 rename rootfs/{services => etc/s6.d}/.s6-svscan/finish (100%)
 create mode 100644 rootfs/etc/s6.d/nginx/crash
 create mode 100644 rootfs/etc/s6.d/nginx/finish
 rename rootfs/{services => etc/s6.d}/nginx/run (100%)
 create mode 100644 rootfs/etc/s6.d/php8/crash
 create mode 100644 rootfs/etc/s6.d/php8/finish
 rename rootfs/{services => etc/s6.d}/php8/run (100%)

diff --git a/rootfs/services/.s6-svscan/crash b/rootfs/etc/s6.d/.s6-svscan/crash
similarity index 100%
rename from rootfs/services/.s6-svscan/crash
rename to rootfs/etc/s6.d/.s6-svscan/crash
diff --git a/rootfs/services/.s6-svscan/finish b/rootfs/etc/s6.d/.s6-svscan/finish
similarity index 100%
rename from rootfs/services/.s6-svscan/finish
rename to rootfs/etc/s6.d/.s6-svscan/finish
diff --git a/rootfs/etc/s6.d/nginx/crash b/rootfs/etc/s6.d/nginx/crash
new file mode 100644
index 0000000..ca55f9a
--- /dev/null
+++ b/rootfs/etc/s6.d/nginx/crash
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exit 1
diff --git a/rootfs/etc/s6.d/nginx/finish b/rootfs/etc/s6.d/nginx/finish
new file mode 100644
index 0000000..ec5b9e5
--- /dev/null
+++ b/rootfs/etc/s6.d/nginx/finish
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exit 0
diff --git a/rootfs/services/nginx/run b/rootfs/etc/s6.d/nginx/run
similarity index 100%
rename from rootfs/services/nginx/run
rename to rootfs/etc/s6.d/nginx/run
diff --git a/rootfs/etc/s6.d/php8/crash b/rootfs/etc/s6.d/php8/crash
new file mode 100644
index 0000000..ca55f9a
--- /dev/null
+++ b/rootfs/etc/s6.d/php8/crash
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exit 1
diff --git a/rootfs/etc/s6.d/php8/finish b/rootfs/etc/s6.d/php8/finish
new file mode 100644
index 0000000..ec5b9e5
--- /dev/null
+++ b/rootfs/etc/s6.d/php8/finish
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exit 0
diff --git a/rootfs/services/php8/run b/rootfs/etc/s6.d/php8/run
similarity index 100%
rename from rootfs/services/php8/run
rename to rootfs/etc/s6.d/php8/run
diff --git a/rootfs/usr/local/bin/startup b/rootfs/usr/local/bin/startup
index c86dc8c..b7c6b59 100644
--- a/rootfs/usr/local/bin/startup
+++ b/rootfs/usr/local/bin/startup
@@ -132,4 +132,4 @@ else
 fi
 
 echo "[INFO] End of startup script. Forum is starting."
-exec su-exec "${UID}:${GID}" /bin/s6-svscan /services
+exec su-exec "${UID}:${GID}" /bin/s6-svscan /etc/s6.d