Update 6.0.0

This commit is contained in:
Cyril 2024-05-01 16:10:07 +02:00
parent bb0b7539a0
commit c8db437b79
63 changed files with 3667 additions and 737 deletions

View file

@ -9,13 +9,16 @@ NGINX_ARGS="-c /usr/data/nginx/nginx/nginx.conf"
case "$1" in
start)
echo "Starting nginx..."
mkdir -p /var/log/nginx /var/tmp/nginx
start-stop-daemon -S -p "$PIDFILE" --exec "$NGINX" -- $NGINX_ARGS
;;
stop)
echo "Stopping nginx..."
start-stop-daemon -K -x "$NGINX" -p "$PIDFILE" -o
;;
reload|force-reload)
echo "Reloading nginx..."
"$NGINX" -s reload
;;
restart)

View file

@ -0,0 +1,31 @@
#!/bin/sh
# USB Camera Service
# Credit: destinal & Guilouz
case "$1" in
start)
echo "Starting USB Camera..."
V4L_DEVS=$(v4l2-ctl --list-devices | grep -A1 usb | sed 's/^[[:space:]]*//g' | grep '^/dev')
CREALITY_CAMS=$(v4l2-ctl --list-devices | grep -E 'CREALITY' | wc -l)
if [ "x$V4L_DEVS" = "x" -o $CREALITY_CAMS -gt 0 ]; then
/opt/bin/mjpg_streamer -b -i "/opt/lib/mjpg-streamer/input_uvc.so -d /dev/video4 -r 1280x720 -f 15" -o "/opt/lib/mjpg-streamer/output_http.so -p 8080"
/opt/bin/mjpg_streamer -b -i "/opt/lib/mjpg-streamer/input_uvc.so -d /dev/video6 -r 1280x720 -f 15" -o "/opt/lib/mjpg-streamer/output_http.so -p 8081"
else
/opt/bin/mjpg_streamer -b -i "/opt/lib/mjpg-streamer/input_uvc.so -d /dev/video4 -r 1280x720 -f 15" -o "/opt/lib/mjpg-streamer/output_http.so -p 8080"
fi
;;
stop)
echo "Stopping USB Camera..."
killall -q mjpg_streamer
;;
restart|reload)
"$0" stop
sleep 1
"$0" start
;;
*)
echo "Usage: /etc/init.d/S50usb_camera {start|stop|restart}"
exit 1
esac
exit $?

View file

@ -0,0 +1,34 @@
#!/bin/sh
# USB Camera Service
# Credit: destinal & Guilouz
case "$1" in
start)
echo "Starting USB Camera..."
V4L_DEVS=$(v4l2-ctl --list-devices | grep -A1 usb | sed 's/^[[:space:]]*//g' | grep '^/dev')
CREALITY_CAMS=$(v4l2-ctl --list-devices | grep -E 'CREALITY|CCX2F3298' | wc -l)
if [ "x$V4L_DEVS" = "x" -o $CREALITY_CAMS -gt 0 ]; then
echo "Error: No third party camera found or you use a Creality camera!"
exit 1
fi
PORT=8080
for V4L_DEV in $V4L_DEVS; do
/opt/bin/mjpg_streamer -b -i "/opt/lib/mjpg-streamer/input_uvc.so -d $V4L_DEV -r 1280x720 -f 15" -o "/opt/lib/mjpg-streamer/output_http.so -p $PORT"
PORT=`expr $PORT + 1`
done
;;
stop)
echo "Stopping USB Camera..."
killall -q mjpg_streamer
;;
restart|reload)
"$0" stop
sleep 1
"$0" start
;;
*)
echo "Usage: /etc/init.d/S50usb_camera {start|stop|restart}"
exit 1
esac
exit $?

View file

@ -12,36 +12,36 @@ PRINTER_LOGS_DIR=$PRINTER_DATA_DIR/logs
PID_FILE=/var/run/moonraker.pid
start() {
[ -d $PRINTER_DATA_DIR ] || mkdir -p $PRINTER_DATA_DIR
[ -d $PRINTER_CONFIG_DIR ] || mkdir -p $PRINTER_CONFIG_DIR
[ -d $PRINTER_LOGS_DIR ] || mkdir -p $PRINTER_LOGS_DIR
rm -rf /usr/data/moonraker/tmp; mkdir -p /usr/data/moonraker/tmp
TMPDIR=/usr/data/moonraker/tmp HOME=/root start-stop-daemon -S -q -b -m -p $PID_FILE \
--exec $PROG -- $PY_SCRIPT -d $PRINTER_DATA_DIR
[ -d $PRINTER_DATA_DIR ] || mkdir -p $PRINTER_DATA_DIR
[ -d $PRINTER_CONFIG_DIR ] || mkdir -p $PRINTER_CONFIG_DIR
[ -d $PRINTER_LOGS_DIR ] || mkdir -p $PRINTER_LOGS_DIR
HOME=/root start-stop-daemon -S -q -b -m -p $PID_FILE \
--exec $PROG -- $PY_SCRIPT -d $PRINTER_DATA_DIR
}
stop() {
start-stop-daemon -K -q -p $PID_FILE
start-stop-daemon -K -q -p $PID_FILE
}
restart() {
stop
sleep 1
start
stop
sleep 1
start
}
case "$1" in
start)
start
;;
start
;;
stop)
stop
;;
stop
;;
restart|reload)
restart
;;
restart
;;
*)
echo "Usage: $0 {start|stop|restart}"
exit 1
echo "Usage: $0 {start|stop|restart}"
exit 1
esac
exit $?