Bug fixes, updated TODO

Nginx will now no longer fail during first-time or if the user doesn't
provide credentials during first-time
This commit is contained in:
Logan G 2020-09-03 16:55:33 -06:00
parent abe1cf4d99
commit a55df5400f
Signed by: logan
GPG key ID: E328528C921E7A7A
3 changed files with 4 additions and 1 deletions

View file

@ -4,8 +4,10 @@
- Add network configuration (replace nmtui) - Add network configuration (replace nmtui)
- Add hostname configuration (replace nmtui) - Add hostname configuration (replace nmtui)
- Add Enclosure plugin to suggested - Add Enclosure plugin to suggested
- Bring back cancel buttons
## Misc ## Misc
- Cleanup
- More security - More security
- Wiki - Wiki

View file

@ -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 install -m 644 files/nginx.conf ${ROOTFS_DIR}/etc/nginx/nginx.conf
echo -e "listen 443;" > ${ROOTFS_DIR}/etc/nginx/listen.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 mkdir -p ${ROOTFS_DIR}/usr/local/bin
install -m 755 files/restart-octoprint ${ROOTFS_DIR}/usr/local/bin/restart-octoprint install -m 755 files/restart-octoprint ${ROOTFS_DIR}/usr/local/bin/restart-octoprint

View file

@ -4,7 +4,7 @@ set -e
install -m 644 files/mjpg-streamer.service ${ROOTFS_DIR}/etc/systemd/system/mjpg-streamer.service 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 install -m 755 files/start-mjpg ${ROOTFS_DIR}/usr/local/bin/start-mjpg
mkdir -p ${ROOTFS_DIR}/usr/local/etc/mjpg-server/ 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 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) # Do some semi janky cross compilation since Golang won't let me set GOBIN when cross compiling (gogl plz fix)