Change scripts to use bash for startup and source /scripts/common. ng…

…ninx as no-daemon
sdr-enthusiasts · Nov 1, 2023 · d6baeeb · d6baeeb
1 parent ebfe0bf
commit d6baeeb
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/rootfs/etc/s6-overlay/scripts/daemon-acars b/rootfs/etc/s6-overlay/scripts/daemon-acars
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 "${s6wrap[@]}" s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-acars.php
diff --git a/rootfs/etc/s6-overlay/scripts/daemon-spotter b/rootfs/etc/s6-overlay/scripts/daemon-spotter
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 "${s6wrap[@]}" s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-spotter.php
diff --git a/rootfs/etc/s6-overlay/scripts/mysql b/rootfs/etc/s6-overlay/scripts/mysql
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 

diff --git a/rootfs/etc/s6-overlay/scripts/nginx b/rootfs/etc/s6-overlay/scripts/nginx
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
-"${s6wrap[@]}" /usr/sbin/nginx
+"${s6wrap[@]}" /usr/sbin/nginx -g 'daemon off;'
diff --git a/rootfs/etc/s6-overlay/scripts/php-fpm b/rootfs/etc/s6-overlay/scripts/php-fpm
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 "${s6wrap[@]}" /usr/sbin/php-fpm7.4 --nodaemonize
diff --git a/rootfs/etc/s6-overlay/scripts/socat b/rootfs/etc/s6-overlay/scripts/socat
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 

diff --git a/rootfs/etc/s6-overlay/scripts/update_db b/rootfs/etc/s6-overlay/scripts/update_db
@@ -1,5 +1,7 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+source /scripts/common
 
 s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 "${s6wrap[@]}" sleep 1h