From a55df5400f89a58f68e8f74dc6811f1a837ca8bc Mon Sep 17 00:00:00 2001 From: Logan Gartner Date: Thu, 3 Sep 2020 16:55:33 -0600 Subject: [PATCH] Bug fixes, updated TODO Nginx will now no longer fail during first-time or if the user doesn't provide credentials during first-time --- TODO.md | 2 ++ stage2/04-octoprint/01-run.sh | 1 + stage2/05-mjpgstreamer/01-run.sh | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/TODO.md b/TODO.md index 9e355be..7e170aa 100644 --- a/TODO.md +++ b/TODO.md @@ -4,8 +4,10 @@ - Add network configuration (replace nmtui) - Add hostname configuration (replace nmtui) - Add Enclosure plugin to suggested +- Bring back cancel buttons ## Misc +- Cleanup - More security - Wiki diff --git a/stage2/04-octoprint/01-run.sh b/stage2/04-octoprint/01-run.sh index 006d06c..d60ce98 100755 --- a/stage2/04-octoprint/01-run.sh +++ b/stage2/04-octoprint/01-run.sh @@ -7,6 +7,7 @@ install -m 600 files/config.yaml ${ROOTFS_DIR}/home/octoprint/.octoprint/config. install -m 644 files/nginx.conf ${ROOTFS_DIR}/etc/nginx/nginx.conf echo -e "listen 443;" > ${ROOTFS_DIR}/etc/nginx/listen.conf +touch ${ROOTFS_DIR}/etc/nginx/auth.conf mkdir -p ${ROOTFS_DIR}/usr/local/bin install -m 755 files/restart-octoprint ${ROOTFS_DIR}/usr/local/bin/restart-octoprint diff --git a/stage2/05-mjpgstreamer/01-run.sh b/stage2/05-mjpgstreamer/01-run.sh index 1eb8b5f..f4fdd4b 100755 --- a/stage2/05-mjpgstreamer/01-run.sh +++ b/stage2/05-mjpgstreamer/01-run.sh @@ -4,7 +4,7 @@ set -e install -m 644 files/mjpg-streamer.service ${ROOTFS_DIR}/etc/systemd/system/mjpg-streamer.service install -m 755 files/start-mjpg ${ROOTFS_DIR}/usr/local/bin/start-mjpg mkdir -p ${ROOTFS_DIR}/usr/local/etc/mjpg-server/ -install -m 755 files/config.sh ${ROOTFS_DIR}/usr/local/etc/mjpg-server/ +install -m 755 files/config.sh ${ROOTFS_DIR}/usr/local/etc/mjpg-server/ if [[ ! -f ${ROOTFS_DIR}/usr/local/bin/mjpeg-server ]]; then # Do some semi janky cross compilation since Golang won't let me set GOBIN when cross compiling (gogl plz fix)