feat: KIAUH v4.0.0 (#191)

resources/autocommit.sh

@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #####################################################################
 ### Please set the paths accordingly. In case you don't have all  ###
 ### the listed folders, just keep that line commented out.        ###
 #####################################################################
-### Path to your config folder you want to backup
+### Path to your config folder you want to back up
 #config_folder=~/klipper_config
 
 ### Path to your Klipper folder, by default that is '~/klipper'
@@ -26,35 +26,38 @@
 #####################################################################
 ################ !!! DO NOT EDIT BELOW THIS LINE !!! ################
 #####################################################################
-grab_version(){
-  if [ ! -z "$klipper_folder" ]; then
-    cd "$klipper_folder"
+grab_version() {
+  local klipper_commit moonraker_commit
+  local mainsail_ver fluidd_ver
+
+  if [[ -n ${klipper_folder} ]]; then
+    cd "${klipper_folder}"
     klipper_commit=$(git rev-parse --short=7 HEAD)
-    m1="Klipper on commit: $klipper_commit"
-    cd ..
+    m1="Klipper on commit: ${klipper_commit}"
   fi
-  if [ ! -z "$moonraker_folder" ]; then
-    cd "$moonraker_folder"
+  if [[ -n ${moonraker_folder} ]]; then
+    cd "${moonraker_folder}"
     moonraker_commit=$(git rev-parse --short=7 HEAD)
-    m2="Moonraker on commit: $moonraker_commit"
-    cd ..
+    m2="Moonraker on commit: ${moonraker_commit}"
   fi
-  if [ ! -z "$mainsail_folder" ]; then
-    mainsail_ver=$(head -n 1 $mainsail_folder/.version)
-    m3="Mainsail version: $mainsail_ver"
+  if [[ -n ${mainsail_folder} ]]; then
+    mainsail_ver=$(head -n 1 "${mainsail_folder}/.version")
+    m3="Mainsail version: ${mainsail_ver}"
   fi
-  if [ ! -z "$fluidd_folder" ]; then
-    fluidd_ver=$(head -n 1 $fluidd_folder/.version)
-    m4="Fluidd version: $fluidd_ver"
+  if [[ -n ${fluidd_folder} ]]; then
+    fluidd_ver=$(head -n 1 "${fluidd_folder}/.version")
+    m4="Fluidd version: ${fluidd_ver}"
   fi
 }
 
-push_config(){
-  cd $config_folder
+push_config() {
+  local current_date
+  
+  cd "${config_folder}" || exit 1
   git pull
   git add .
   current_date=$(date +"%Y-%m-%d %T")
-  git commit -m "Autocommit from $current_date" -m "$m1" -m "$m2" -m "$m3" -m "$m4"
+  git commit -m "Autocommit from ${current_date}" -m "${m1}" -m "${m2}" -m "${m3}" -m "${m4}"
   git push
 }
 

resources/dwc2_nginx.cfg

@@ -1,26 +0,0 @@
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-upstream dwc2 {
-    server 127.0.0.1:4750;
-}
-
-server {
-    listen 80;
-    #listen [::]:80;
-
-    location / {
-        proxy_pass http://dwc2/;
-        proxy_set_header Host $http_host;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-        #proxy_set_header X-Script-Name /;
-        proxy_http_version 1.1;
-        client_max_body_size 0;
-    }
-}

resources/klipper.service

@@ -1,15 +1,22 @@
-#Systemd service file for klipper
+#Systemd Klipper Service
+
 [Unit]
-Description=Starts klipper instance %INST% on startup
+Description=Systemd Klipper Service for instance klipper-%INST%
+Documentation=https://www.klipper3d.org/
 After=network.target
+Wants=udev.target
 
 [Install]
 WantedBy=multi-user.target
 
 [Service]
+Environment=KLIPPER_CONFIG=%CFG%
+Environment=KLIPPER_LOG=%LOG%
+Environment=KLIPPER_SOCKET=%UDS%
+Environment=KLIPPER_PRINTER=%PRINTER%
 Type=simple
 User=%USER%
 RemainAfterExit=yes
-ExecStart=%KL_ENV%/bin/python %KL_DIR%/klippy/klippy.py %P_CFG% -I %P_TMP% -l %KL_LOG% -a %KL_UDS%
+ExecStart=%ENV%/bin/python %DIR%/klippy/klippy.py ${KLIPPER_CONFIG} -I ${KLIPPER_PRINTER} -l ${KLIPPER_LOG} -a ${KLIPPER_SOCKET}
 Restart=always
 RestartSec=10

resources/moonraker-telegram-bot.service

@@ -0,0 +1,19 @@
+#Systemd service file for Moonraker Telegram Bot
+
+[Unit]
+Description=Starts Moonraker Telegram Bot instance %INST% on startup
+Documentation=https://github.com/nlef/moonraker-telegram-bot/wiki
+After=network.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Environment=TELEGRAM_CONF=%CFG%
+Environment=TELEGRAM_LOG=%LOG%
+Type=simple
+User=%USER%
+RemainAfterExit=yes
+ExecStart=%ENV%/bin/python %DIR%/bot/main.py -c ${TELEGRAM_CONF} -l ${TELEGRAM_LOG}
+Restart=always
+RestartSec=10

resources/moonraker.conf

@@ -4,9 +4,6 @@ port: %PORT%
 enable_debug_logging: False
 klippy_uds_address: %UDS%
 
-[database]
-database_path: %MR_DB%
-
 [authorization]
 trusted_clients:
     %LAN%
@@ -25,6 +22,9 @@ cors_domains:
     https://app.fluidd.xyz
     http://app.fluidd.xyz
 
+[database]
+database_path: %DB%
+
 [file_manager]
 config_path: %CFG%
 log_path: %LOG%
@@ -36,21 +36,3 @@ log_path: %LOG%
 [update_manager]
 channel: dev
 refresh_interval: 168
-
-[update_manager mainsail]
-type: web
-repo: mainsail-crew/mainsail
-path: ~/mainsail
-
-[update_manager fluidd]
-type: web
-repo: fluidd-core/fluidd
-path: ~/fluidd
-
-#[update_manager KlipperScreen]
-#type: git_repo
-#path: /home/%USER%/KlipperScreen
-#origin: https://github.com/jordanruthe/KlipperScreen.git
-#env: /home/%USER%/.KlipperScreen-env/bin/python
-#requirements: scripts/KlipperScreen-requirements.txt
-#install_script: scripts/KlipperScreen-install.sh

resources/moonraker.service

@@ -1,16 +1,20 @@
-#Systemd service file for moonraker
+#Systemd Moonraker Service
+
 [Unit]
-Description=Starts Moonraker %INST% on startup
+Description=Systemd Moonraker Service for instance moonraker-%INST%
+Documentation=https://moonraker.readthedocs.io/
 After=network.target
 
 [Install]
 WantedBy=multi-user.target
 
 [Service]
+Environment=MOONRAKER_CONF=%CFG%
+Environment=MOONRAKER_LOG=%LOG%
 Type=simple
 SupplementaryGroups=moonraker-admin
 User=%USER%
 RemainAfterExit=yes
-ExecStart=%MR_ENV%/bin/python %MR_DIR%/moonraker/moonraker.py -l %MR_LOG% -c %MR_CONF%
+ExecStart=%ENV%/bin/python %DIR%/moonraker/moonraker.py -c ${MOONRAKER_CONF} -l ${MOONRAKER_LOG}
 Restart=always
 RestartSec=10

resources/octoprint_nginx.cfg

@@ -1,40 +0,0 @@
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-upstream octoprint {
-    server 127.0.0.1:5000;
-}
-
-upstream mjpg-streamer {
-    server 127.0.0.1:8080;
-}
-
-server {
-    listen 80;
-    #listen [::]:80;
-
-    location / {
-        proxy_pass http://octoprint/;
-        proxy_set_header Host $http_host;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme $scheme;
-        #proxy_set_header X-Script-Name /;
-        proxy_http_version 1.1;
-        client_max_body_size 0;
-    }
-
-    location /webcam {
-        proxy_pass http://mjpg-streamer/;
-    }
-
-    # redirect server error pages to the static page /50x.html
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   html;
-    }
-}

resources/printer.cfg

@@ -1,13 +1,6 @@
 [mcu]
 serial: /dev/serial/by-id/<your-mcu-id>
 
-[pause_resume]
-
-[display_status]
-
-[virtual_sdcard]
-path: ~/gcode_files
-
 [printer]
 kinematics: none
 max_velocity: 1000