From 8ee277fe2c7932df23ea57da16668a6811967941 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 3 Jan 2021 16:18:37 +0100 Subject: [PATCH 1/5] fix: set the correct port 8080 for mjpgstreamer --- resources/moonraker_nginx.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/moonraker_nginx.cfg b/resources/moonraker_nginx.cfg index c868181..4ecd9c6 100644 --- a/resources/moonraker_nginx.cfg +++ b/resources/moonraker_nginx.cfg @@ -9,5 +9,5 @@ upstream apiserver { upstream mjpgstreamer { #edit your webcam port here ip_hash; - server 127.0.0.1:8081; -} \ No newline at end of file + server 127.0.0.1:8080; +} From 43a724b80eae386a4c17b2d8582f4f11bbf9b9e6 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Thu, 7 Jan 2021 16:22:20 +0100 Subject: [PATCH 2/5] fix: add disable command --- scripts/remove.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/remove.sh b/scripts/remove.sh index a1dc99a..eae88df 100755 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -14,12 +14,15 @@ remove_klipper(){ status_msg "Removing Klipper Service ..." sudo rm -rf /etc/init.d/klipper /etc/default/klipper sudo update-rc.d -f klipper remove + sudo systemctl disable klipper + sudo systemctl daemon-reload ok_msg "Klipper Service removed!" fi if [ -e /etc/systemd/system/klipper.service ]; then status_msg "Removing Klipper Service ..." sudo rm -rf /etc/systemd/system/klipper.service sudo update-rc.d -f klipper remove + sudo systemctl disable klipper sudo systemctl daemon-reload ok_msg "Klipper Service removed!" fi From 748a700c364365a6bc6ea7dbb2838bde35ae9b57 Mon Sep 17 00:00:00 2001 From: Jordan Ruthe Date: Wed, 20 Jan 2021 17:07:30 -0500 Subject: [PATCH 3/5] klipperscreen: update to fix an exit problem --- scripts/install_klipperscreen.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/install_klipperscreen.sh b/scripts/install_klipperscreen.sh index d028342..b8e719d 100644 --- a/scripts/install_klipperscreen.sh +++ b/scripts/install_klipperscreen.sh @@ -29,7 +29,11 @@ python3_check(){ } system_check_klipperscreen(){ - [ ! -e ${HOME}/klipper_config/KlipperScreen.log ] && KLIPPERSCREEN_SL_FOUND="false" + if [ ! -e ${HOME}/klipper_config/KlipperScreen.log ]; then + KLIPPERSCREEN_SL_FOUND="false" + else + KLIPPERSCREEN_SL_FOUND="true" + fi } get_user_selections_klipperscreen(){ From 036fb0813226038773730c6a0387a4f77adb2110 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Fri, 22 Jan 2021 20:52:21 +0100 Subject: [PATCH 4/5] fix: remove upload limit of 200M in NGINX configs for mainsail and fluidd --- resources/fluidd_nginx.cfg | 4 ++-- resources/mainsail_nginx.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/fluidd_nginx.cfg b/resources/fluidd_nginx.cfg index 36adf37..38fb908 100644 --- a/resources/fluidd_nginx.cfg +++ b/resources/fluidd_nginx.cfg @@ -24,7 +24,7 @@ server { server_name _; #max upload size for gcodes - client_max_body_size 200M; + client_max_body_size 0; location / { try_files $uri $uri/ /index.html; @@ -84,4 +84,4 @@ server { location /webcam/ { proxy_pass http://mjpgstreamer/; } -} \ No newline at end of file +} diff --git a/resources/mainsail_nginx.cfg b/resources/mainsail_nginx.cfg index 4a3e93f..b319f07 100644 --- a/resources/mainsail_nginx.cfg +++ b/resources/mainsail_nginx.cfg @@ -24,7 +24,7 @@ server { server_name _; #max upload size for gcodes - client_max_body_size 200M; + client_max_body_size 0; location / { try_files $uri $uri/ /index.html; @@ -84,4 +84,4 @@ server { location /webcam/ { proxy_pass http://mjpgstreamer/; } -} \ No newline at end of file +} From d12554d2b713f68172ec15c4130abd0199f7395c Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sat, 23 Jan 2021 15:52:51 +0100 Subject: [PATCH 5/5] fix: apply a force reset --hard before updating KIAUH. Fix for #63 --- scripts/install_klipperscreen.sh | 0 scripts/update.sh | 2 ++ 2 files changed, 2 insertions(+) mode change 100644 => 100755 scripts/install_klipperscreen.sh diff --git a/scripts/install_klipperscreen.sh b/scripts/install_klipperscreen.sh old mode 100644 new mode 100755 diff --git a/scripts/update.sh b/scripts/update.sh index de9e306..9a795df 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -2,6 +2,8 @@ update_kiauh(){ if [ "$KIAUH_UPDATE_AVAIL" = "true" ]; then status_msg "Updating KIAUH ..." cd ${HOME}/kiauh + ### force reset kiauh before updating + git reset --hard git pull && ok_msg "Update complete! Please restart KIAUH." exit -1 fi