jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-14 11:04:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into kiauh-rework

Browse Source
This commit is contained in:
th33xitus
2021-01-25 19:01:55 +01:00
parent 65062bdfda d12554d2b7
commit 1527d7a25d
9 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/fluidd_nginx.cfg
View File

@@ -56,4 +56,4 @@ server {
location /webcam/ {
proxy_pass http://mjpgstreamer/;
}
}
}

2
resources/mainsail_nginx.cfg
View File

@@ -56,4 +56,4 @@ server {
location /webcam/ {
proxy_pass http://mjpgstreamer/;
}
}
}

2
resources/upstreams.conf
View File

@@ -10,4 +10,4 @@ upstream mjpgstreamer {
#edit your webcam port here
ip_hash;
server 127.0.0.1:8080;
}
}

4
scripts/install_dwc2.sh
View File

@@ -1,7 +1,3 @@
##############################################################################################
#********************************************************************************************#
##############################################################################################
### base variables
SYSTEMDDIR="/etc/systemd/system"
DWC_ENV="${HOME}/dwc-env"

2
scripts/install_klipper.sh
View File

@@ -115,7 +115,7 @@ MULTI_STARTSCRIPT
create_minimal_printer_cfg(){
/bin/sh -c "cat > $1" << MINIMAL_CFG
[mcu]
serial: /dev/serial/by-id/
serial: /dev/serial/by-id/<put-in-mcu-id>
[pause_resume]
[display_status]

6
scripts/install_klipperscreen.sh Normal file → Executable file
View File

@@ -30,7 +30,11 @@ python3_check(){
}
system_check_klipperscreen(){
[ ! -e $klipper_cfg_loc/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(){

4
scripts/install_moonraker.sh
View File

@@ -1,7 +1,3 @@
##############################################################################################
#********************************************************************************************#
##############################################################################################
### base variables
SYSTEMDDIR="/etc/systemd/system"
MOONRAKER_ENV="${HOME}/moonraker-env"

4
scripts/install_octoprint.sh
View File

@@ -1,7 +1,3 @@
##############################################################################################
#********************************************************************************************#
##############################################################################################
### base variables
SYSTEMDDIR="/etc/systemd/system"
OCTOPRINT_ENV="${HOME}/OctoPrint"

2
scripts/update.sh
View File

@@ -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