fix: big refactoring of the moonraker installer

scripts/install_moonraker.sh

@@ -1,9 +1,14 @@
+##############################################################################################
+#********************************************************************************************#
+##############################################################################################
+
 ### base variables
 SYSTEMDDIR="/etc/systemd/system"
 MOONRAKER_ENV="${HOME}/moonraker-env"
 MOONRAKER_DIR="${HOME}/moonraker"
 
-python3_check(){
+system_check_moonraker(){
+  ### python 3 check
   status_msg "Your Python 3 version is: $(python3 --version)"
   major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1)
   minor=$(python3 --version | cut -d"." -f2)
@@ -14,18 +19,37 @@ python3_check(){
     warn_msg "Python version not ok!"
     py_chk_ok="false"
   fi
+
+  ### check system for an installed octoprint service
+  if systemctl is-enabled octoprint.service -q 2>/dev/null; then
+    OCTOPRINT_ENABLED="true"
+  fi
+
+  ### check system for an installed haproxy service
+  if [[ $(dpkg-query -f'${Status}' --show haproxy 2>/dev/null) = *\ installed ]]; then
+    HAPROXY_FOUND="true"
+  fi
+
+  ### check system for an installed lighttpd service
+  if [[ $(dpkg-query -f'${Status}' --show lighttpd 2>/dev/null) = *\ installed ]]; then
+    LIGHTTPD_FOUND="true"
+  fi
+
 }
 
+### check the users linux system
 moonraker_setup_dialog(){
-  ### check system for python3 before initializing the moonraker installation
+  status_msg "Initializing Moonraker installation ..."
-  python3_check
+
+  ### check system for several requirements before initializing the moonraker installation
+  system_check_moonraker
+
+  ### exit moonraker setup if python version is not ok
   if [ $py_chk_ok = "false" ]; then
     ERROR_MSG="Python 3.7 or above required!\n Please upgrade your Python version first."
     print_msg && clear_msg && return 0
   fi
 
-  status_msg "Initializing Moonraker installation ..."
-
   ### check for existing moonraker service installations
   if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "moonraker.service")" ] || [ "$(systemctl list-units --full -all -t service --no-legend | grep -E "moonraker-[[:digit:]].service")" ]; then
     ERROR_MSG="At least one Moonraker service is already installed!" && return 0
@@ -46,11 +70,19 @@ moonraker_setup_dialog(){
   ### initial moonraker.conf path check
   check_klipper_cfg_path
 
-  ### ask for amount of instances to create
+  ### ask user how to handle OctoPrint, Haproxy and Lighttpd
+  process_octoprint_dialog
+  process_haproxy_lighttpd_dialog
+
+  ### instance confirmation dialog
   while true; do
       echo
       top_border
-      printf "|%-55s|\n" " $INSTANCE_COUNT Klipper instances were found!"
+      if [ $INSTANCE_COUNT -gt 1 ]; then
+        printf "|%-55s|\n" " $INSTANCE_COUNT Klipper instances were found!"
+      else
+        echo -e "| 1 Klipper instance was found!                         | "
+      fi
       echo -e "| You need one Moonraker instance per Klipper instance. | "
       bottom_border
       echo
@@ -73,6 +105,46 @@ moonraker_setup_dialog(){
   done
 }
 
+moonraker_setup(){
+  ### get printer config directory
+  source_kiauh_ini
+  MOONRAKER_CONF_LOC="$klipper_cfg_loc"
+
+  ### step 1: clone moonraker
+  status_msg "Downloading Moonraker ..."
+  ### force remove existing moonraker dir and clone into fresh moonraker dir
+  [ -d $MOONRAKER_DIR ] && rm -rf $MOONRAKER_DIR
+  cd ${HOME} && git clone $MOONRAKER_REPO
+  status_msg "Download complete!"
+
+  ### step 2: install moonraker dependencies and create python virtualenv
+  status_msg "Installing dependencies ..."
+  install_moonraker_packages
+  create_moonraker_virtualenv
+
+  ### step 3: create moonraker.conf folder and moonraker.confs
+  [ ! -d $MOONRAKER_CONF_LOC ] && mkdir -p $MOONRAKER_CONF_LOC
+  moonraker_conf_creation
+
+  ### step 4: set up moonrakers nginx configs
+  setup_moonraker_nginx_cfg
+
+  ### step 5: process possible disruptive services
+  process_haproxy_lighttpd_services
+
+  ### step 6: create final moonraker instances
+  INSTANCE=1
+  if [ $INSTANCE_COUNT -eq $INSTANCE ]; then
+    create_single_moonraker_instance
+  else
+    create_multi_moonraker_instance
+  fi
+}
+
+##############################################################################################
+#********************************************************************************************#
+##############################################################################################
+
 install_moonraker_packages(){
   PKGLIST="python3-virtualenv python3-dev nginx libopenjp2-7 python3-libgpiod"
 
@@ -138,41 +210,74 @@ RestartSec=10
 EOF
 }
 
-moonraker_setup(){
+create_single_moonraker_conf(){
-  ### get printer config directory
+  HOSTNAME=$(hostname -I | cut -d" " -f1)
-  source_kiauh_ini
+  LOCAL_NETWORK="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-3).0/24"
-  MOONRAKER_CONF_LOC="$klipper_cfg_loc"
 
-  ### clone moonraker
+/bin/sh -c "cat > $MOONRAKER_CONF_LOC/moonraker.conf" << MOONRAKERCONF
-  status_msg "Downloading Moonraker ..."
+[server]
-  ### force remove existing moonraker dir
+host: 0.0.0.0
-  [ -d $MOONRAKER_DIR ] && rm -rf $MOONRAKER_DIR
+port: $PORT
+klippy_uds_address: /tmp/klippy_uds
+enable_debug_logging: True
+config_path: $PRINTER_CFG_LOC
 
-  ### clone into fresh moonraker dir
+[authorization]
-  cd ${HOME} && git clone $MOONRAKER_REPO
+enabled: True
-  status_msg "Download complete!"
+api_key_file: ~/.moonraker_api_key
+trusted_clients:
+    127.0.0.1
+    $LOCAL_NETWORK
+cors_domains:
+    http://*.local
+    http://my.mainsail.app
+    https://my.mainsail.app
+    http://app.fluidd.xyz
+    https://app.fluidd.xyz
+    http://$HOSTNAME
 
-  ### install klipper dependencies and create python virtualenv
+[update_manager]
-  status_msg "Installing dependencies ..."
+#client_repo:
-  install_moonraker_packages
+#client_path:
-  create_moonraker_virtualenv
+MOONRAKERCONF
-
-  ### create moonraker.conf folder
-  ### athough it should already exist because its the same as the klipper config folder
-  [ ! -d $MOONRAKER_CONF_LOC ] && mkdir -p $MOONRAKER_CONF_LOC
-
-  ### create moonraker.confs
-  moonraker_conf_creation
-
-  ### create moonraker instances
-  INSTANCE=1
-  if [ $INSTANCE_COUNT -eq $INSTANCE ]; then
-    create_single_moonraker_instance
-  else
-    create_multi_moonraker_instance
-  fi
 }
 
+create_multi_moonraker_conf(){
+  HOSTNAME=$(hostname -I | cut -d" " -f1)
+  LOCAL_NETWORK="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-3).0/24"
+
+/bin/sh -c "cat > $MOONRAKER_CONF_LOC/printer_$INSTANCE/moonraker.conf" << MOONRAKERCONF
+[server]
+host: 0.0.0.0
+port: $PORT
+klippy_uds_address: /tmp/klippy_uds-$INSTANCE
+enable_debug_logging: True
+config_path: $PRINTER_CFG_LOC/printer_$INSTANCE
+
+[authorization]
+enabled: True
+api_key_file: ~/.moonraker_api_key
+trusted_clients:
+    127.0.0.1
+    $LOCAL_NETWORK
+cors_domains:
+    http://*.local
+    http://my.mainsail.app
+    https://my.mainsail.app
+    http://app.fluidd.xyz
+    https://app.fluidd.xyz
+    http://$HOSTNAME
+
+[update_manager]
+#client_repo:
+#client_path:
+MOONRAKERCONF
+}
+
+##############################################################################################
+#********************************************************************************************#
+##############################################################################################
+
 print_ip_list(){
   i=1
   for ip in ${ip_list[@]}; do
@@ -240,6 +345,22 @@ create_multi_moonraker_instance(){
   print_ip_list; echo
 }
 
+setup_moonraker_nginx_cfg(){
+  get_date
+
+  ### backup existing nginx configs
+  [ -f $NGINX_CONFD/upstreams.conf ] && sudo mv $NGINX_CONFD/upstreams.conf $NGINX_CONFD/$current_date_upstreams.conf
+  [ -f $NGINX_CONFD/common_vars.conf ] && sudo mv $NGINX_CONFD/common_vars.conf $NGINX_CONFD/$current_date_common_vars.conf
+
+  ### copy nginx configs to target destination
+  if [ ! -f $NGINX_CONFD/upstreams.conf ]; then
+    sudo cp ${SRCDIR}/kiauh/resources/moonraker_nginx.cfg $NGINX_CONFD/upstreams.conf
+  fi
+  if [ ! -f $NGINX_CONFD/common_vars.conf ]; then
+    sudo cp ${SRCDIR}/kiauh/resources/common_vars_nginx.cfg $NGINX_CONFD/common_vars.conf
+  fi
+}
+
 moonraker_conf_creation(){
   ### default moonraker port
   DEFAULT_PORT=7125
@@ -296,249 +417,59 @@ moonraker_conf_creation(){
   fi
 }
 
-create_single_moonraker_conf(){
-  HOSTNAME=$(hostname -I | cut -d" " -f1)
-  LOCAL_NETWORK="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-3).0/24"
-
-/bin/sh -c "cat > $MOONRAKER_CONF_LOC/moonraker.conf" << MOONRAKERCONF
-[server]
-host: 0.0.0.0
-port: $PORT
-klippy_uds_address: /tmp/klippy_uds
-enable_debug_logging: True
-config_path: $PRINTER_CFG_LOC
-
-[authorization]
-enabled: True
-api_key_file: ~/.moonraker_api_key
-trusted_clients:
-    127.0.0.1
-    $LOCAL_NETWORK
-cors_domains:
-    http://*.local
-    http://my.mainsail.app
-    https://my.mainsail.app
-    http://app.fluidd.xyz
-    https://app.fluidd.xyz
-    http://$HOSTNAME
-
-[update_manager]
-#client_repo:
-#client_path:
-MOONRAKERCONF
-}
-
-create_multi_moonraker_conf(){
-  HOSTNAME=$(hostname -I | cut -d" " -f1)
-  LOCAL_NETWORK="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-3).0/24"
-
-/bin/sh -c "cat > $MOONRAKER_CONF_LOC/printer_$INSTANCE/moonraker.conf" << MOONRAKERCONF
-[server]
-host: 0.0.0.0
-port: $PORT
-klippy_uds_address: /tmp/klippy_uds-$INSTANCE
-enable_debug_logging: True
-config_path: $PRINTER_CFG_LOC/printer_$INSTANCE
-
-[authorization]
-enabled: True
-api_key_file: ~/.moonraker_api_key
-trusted_clients:
-    127.0.0.1
-    $LOCAL_NETWORK
-cors_domains:
-    http://*.local
-    http://my.mainsail.app
-    https://my.mainsail.app
-    http://app.fluidd.xyz
-    https://app.fluidd.xyz
-    http://$HOSTNAME
-
-[update_manager]
-#client_repo:
-#client_path:
-MOONRAKERCONF
-}
-
-
 ##############################################################################################
 #********************************************************************************************#
 ##############################################################################################
 
+# add_trusted_clients_dialog(){
+#   #ask user for more trusted clients
+#     while true; do
+#       echo
+#       top_border
+#       echo -e "| Apart from devices of your local network, you can add |"
+#       echo -e "| additional trusted clients to the moonraker.conf file |"
+#       bottom_border
+#       read -p "${cyan}###### Add additional trusted clients? (y/N):${default} " yn
+#       case "$yn" in
+#         Y|y|Yes|yes)
+#           echo -e "###### > Yes"
+#           ADD_TRUSTED_CLIENT="true"
+#           custom_trusted_clients
+#           break;;
+#         N|n|No|no|"")
+#           echo -e "###### > No"
+#           ADD_TRUSTED_CLIENT="false"
+#           break;;
+#         *)
+#           print_unkown_cmd
+#           print_msg && clear_msg;;
+#       esac
+#     done
+# }
 
-install_moonraker(){
+process_octoprint_dialog(){
-  python3_check
+  #ask user to disable octoprint when its service was found
-  if [ $py_chk_ok = "true" ]; then
-    system_check_moonraker
-    #ask user for customization
-    get_user_selections_moonraker
-    #disable/remove haproxy/lighttpd
-    handle_haproxy_lighttpd
-    #moonraker main installation
-    moonraker_setup
-    check_for_folder_moonraker
-    #setup configs
-    setup_printer_config_moonraker
-    setup_moonraker_conf
-    #execute customizations
-    write_custom_trusted_clients
-    symlinks_moonraker
-    disable_octoprint
-    #after install actions
-    restart_moonraker
-    klipper_service "restart"
-  else
-    ERROR_MSG="Python 3.7 or above required!\n Please upgrade your Python version first."
-    print_msg && clear_msg
-  fi
-}
-
-system_check_moonraker(){
-  status_msg "Initializing Moonraker installation ..."
-  #check for existing printer.cfg and for the location
-  locate_printer_cfg
-  if [ -f $PRINTER_CFG ]; then
-    PRINTER_CFG_FOUND="true"
-    PRINTER_CFG_LOC=$PRINTER_CFG
-  else
-    PRINTER_CFG_FOUND="false"
-  fi
-  #check for existing klippy.log symlink in /klipper_config
-  [ ! -e ${HOME}/klipper_config/klippy.log ] && KLIPPY_SL_FOUND="false"
-  #check for existing moonraker.log symlink in /klipper_config
-  [ ! -e ${HOME}/klipper_config/moonraker.log ] && MOONRAKER_SL_FOUND="false"
-  #check for existing moonraker.conf
-  if [ ! -f ${HOME}/moonraker.conf ]; then
-    MOONRAKER_CONF_FOUND="false"
-  else
-    MOONRAKER_CONF_FOUND="true"
-  fi
-  #check if octoprint is installed
-  if systemctl is-enabled octoprint.service -q 2>/dev/null; then
-    unset OCTOPRINT_ENABLED
-    OCTOPRINT_ENABLED="true"
-  fi
-  #check if haproxy is installed
-  if [[ $(dpkg-query -f'${Status}' --show haproxy 2>/dev/null) = *\ installed ]]; then
-    HAPROXY_FOUND="true"
-  fi
-  #check if lighttpd is installed
-  if [[ $(dpkg-query -f'${Status}' --show lighttpd 2>/dev/null) = *\ installed ]]; then
-    LIGHTTPD_FOUND="true"
-  fi
-}
-
-get_user_selections_moonraker(){
-  #user selection for printer.cfg
-  if [ "$PRINTER_CFG_FOUND" = "false" ]; then
-    while true; do
-      echo
-      top_border
-      echo -e "|         ${red}WARNING! - No printer.cfg was found!${default}          |"
-      hr
-      echo -e "|  KIAUH can create a minimal printer.cfg with only the |"
-      echo -e "|  recommended Moonraker config entries if you wish.    |"
-      echo -e "|                                                       |"
-      echo -e "|  Please be aware, that this option will ${red}NOT${default} create a  |"
-      echo -e "|  fully working printer.cfg for you!                   |"
-      bottom_border
-      read -p "${cyan}###### Create a default printer.cfg? (Y/n):${default} " yn
-      case "$yn" in
-        Y|y|Yes|yes|"")
-          echo -e "###### > Yes"
-          SEL_DEF_CFG="true"
-          break;;
-        N|n|No|no)
-          echo -e "###### > No"
-          SEL_DEF_CFG="false"
-          break;;
-        *)
-          print_unkown_cmd
-          print_msg && clear_msg;;
-      esac
-    done
-  fi
-  #user selection for moonraker.log symlink
-  if [ "$KLIPPY_SL_FOUND" = "false" ]; then
-    while true; do
-      echo
-      read -p "${cyan}###### Create klippy.log symlink? (y/N):${default} " yn
-      case "$yn" in
-        Y|y|Yes|yes)
-          echo -e "###### > Yes"
-          SEL_KLIPPYLOG_SL="true"
-          break;;
-        N|n|No|no|"")
-          echo -e "###### > No"
-          SEL_KLIPPYLOG_SL="false"
-          break;;
-        *)
-          print_unkown_cmd
-          print_msg && clear_msg;;
-      esac
-    done
-  fi
-  #user selection for moonraker.log symlink
-  if [ "$MOONRAKER_SL_FOUND" = "false" ]; then
-    while true; do
-      echo
-      read -p "${cyan}###### Create moonraker.log symlink? (y/N):${default} " yn
-      case "$yn" in
-        Y|y|Yes|yes)
-          echo -e "###### > Yes"
-          SEL_MRLOG_SL="true"
-          break;;
-        N|n|No|no|"")
-          echo -e "###### > No"
-          SEL_MRLOG_SL="false"
-          break;;
-        *)
-          print_unkown_cmd
-          print_msg && clear_msg;;
-      esac
-    done
-  fi
-  #ask user for more trusted clients
-    while true; do
-      echo
-      top_border
-      echo -e "| Apart from devices of your local network, you can add |"
-      echo -e "| additional trusted clients to the moonraker.conf file |"
-      bottom_border
-      read -p "${cyan}###### Add additional trusted clients? (y/N):${default} " yn
-      case "$yn" in
-        Y|y|Yes|yes)
-          echo -e "###### > Yes"
-          ADD_TRUSTED_CLIENT="true"
-          custom_trusted_clients
-          break;;
-        N|n|No|no|"")
-          echo -e "###### > No"
-          ADD_TRUSTED_CLIENT="false"
-          break;;
-        *)
-          print_unkown_cmd
-          print_msg && clear_msg;;
-      esac
-    done
-  #ask user to disable octoprint when such installed service was found
   if [ "$OCTOPRINT_ENABLED" = "true" ]; then
-    unset DISABLE_OPRINT
     while true; do
       echo
-      warn_msg "OctoPrint service found!"
+      top_border
-      echo -e "You might consider disabling the OctoPrint service,"
+      echo -e "|       ${red}!!! WARNING - OctoPrint service found !!!${default}       |"
-      echo -e "since an active OctoPrint service may lead to unexpected"
+      hr
-      echo -e "behavior of the Mainsail Webinterface."
+      echo -e "|  You might consider disabling the OctoPrint service,  |"
+      echo -e "|  since an active OctoPrint service may lead to unex-  |"
+      echo -e "|  pected behavior of the Klipper Webinterfaces.        |"
+      bottom_border
       read -p "${cyan}###### Do you want to disable OctoPrint now? (Y/n):${default} " yn
       case "$yn" in
         Y|y|Yes|yes|"")
           echo -e "###### > Yes"
-          DISABLE_OPRINT="true"
+          status_msg "Stopping OctoPrint ..."
+          sudo systemctl stop octoprint && ok_msg "OctoPrint service stopped!"
+          status_msg "Disabling OctoPrint ..."
+          sudo systemctl disable octoprint && ok_msg "OctoPrint service disabled!"
           break;;
         N|n|No|no)
           echo -e "###### > No"
-          DISABLE_OPRINT="false"
           break;;
         *)
           print_unkown_cmd
@@ -546,6 +477,51 @@ get_user_selections_moonraker(){
       esac
     done
   fi
+}
+
+process_haproxy_lighttpd_services(){
+  #handle haproxy service
+  if [ "$DISABLE_HAPROXY" = "true" ] || [ "$REMOVE_HAPROXY" = "true" ]; then
+    if systemctl is-active haproxy -q; then
+      status_msg "Stopping haproxy service ..."
+      sudo systemctl stop haproxy && ok_msg "Service stopped!"
+    fi
+
+    ### disable haproxy
+    if [ "$DISABLE_HAPROXY" = "true" ]; then
+      status_msg "Disabling haproxy ..."
+      sudo systemctl disable haproxy && ok_msg "Haproxy service disabled!"
+
+      ### remove haproxy
+      if [ "$REMOVE_HAPROXY" = "true" ]; then
+        status_msg "Removing haproxy ..."
+        sudo apt-get remove haproxy -y && sudo update-rc.d -f haproxy remove && ok_msg "Haproxy removed!"
+      fi
+    fi
+  fi
+
+  ### handle lighttpd service
+  if [ "$DISABLE_LIGHTTPD" = "true" ] || [ "$REMOVE_LIGHTTPD" = "true" ]; then
+    if systemctl is-active lighttpd -q; then
+      status_msg "Stopping lighttpd service ..."
+      sudo systemctl stop lighttpd && ok_msg "Service stopped!"
+    fi
+
+    ### disable lighttpd
+    if [ "$DISABLE_LIGHTTPD" = "true" ]; then
+      status_msg "Disabling lighttpd ..."
+      sudo systemctl disable lighttpd && ok_msg "Lighttpd service disabled!"
+
+      ### remove lighttpd
+      if [ "$REMOVE_LIGHTTPD" = "true" ]; then
+        status_msg "Removing lighttpd ..."
+        sudo apt-get remove lighttpd -y && sudo update-rc.d -f lighttpd remove && ok_msg "Lighttpd removed!"
+      fi
+    fi
+  fi
+}
+
+process_haproxy_lighttpd_dialog(){
   #notify user about haproxy or lighttpd services found and possible issues
   if [ "$HAPROXY_FOUND" = "true" ] || [ "$LIGHTTPD_FOUND" = "true" ]; then
     while true; do
@@ -572,11 +548,11 @@ get_user_selections_moonraker(){
         1)
           echo -e "###### > Remove packages"
           if [ "$HAPROXY_FOUND" = "true" ]; then
-            DISABLE_HAPROXY="false"
+            DISABLE_HAPROXY="true"
             REMOVE_HAPROXY="true"
           fi
           if [ "$LIGHTTPD_FOUND" = "true" ]; then
-            DISABLE_LIGHTTPD="false"
+            DISABLE_LIGHTTPD="true"
             REMOVE_LIGHTTPD="true"
           fi
           break;;
@@ -593,10 +569,6 @@ get_user_selections_moonraker(){
           break;;
         3)
           echo -e "###### > Skip"
-          DISABLE_LIGHTTPD="false"
-          REMOVE_LIGHTTPD="false"
-          DISABLE_HAPROXY="false"
-          REMOVE_HAPROXY="false"
           break;;
         *)
           print_unkown_cmd
@@ -604,277 +576,104 @@ get_user_selections_moonraker(){
       esac
     done
   fi
-  status_msg "Installation will start now! Please wait ..."
 }
 
 #############################################################
 #############################################################
 
-#moonraker_setup(){
+# setup_moonraker_conf(){
-#  dep=(wget curl unzip dfu-util)
+#   if [ "$MOONRAKER_CONF_FOUND" = "false" ]; then
-#  dependency_check
+#     status_msg "Creating moonraker.conf ..."
-#  status_msg "Downloading Moonraker ..."
+#     cp ${HOME}/kiauh/resources/moonraker.conf ${HOME}
-#  #force remove existing moonraker dir
+#     ok_msg "moonraker.conf created!"
-#  [ -d $MOONRAKER_DIR ] && rm -rf $MOONRAKER_DIR
+#     status_msg "Writing trusted clients to config ..."
-#  #clone into fresh moonraker dir
+#     write_default_trusted_clients
-#  cd ${HOME} && git clone $MOONRAKER_REPO
+#     ok_msg "Trusted clients written!"
-#  ok_msg "Download complete!"
+#   fi
-#  status_msg "Installing Moonraker ..."
+#   #check for at least one trusted client in an already existing moonraker.conf
-#  $MOONRAKER_DIR/scripts/install-moonraker.sh
+#   #if no entry is found, write default trusted client
-#  #copy moonraker configuration for nginx to /etc/nginx/conf.d
+#   if [ "$MOONRAKER_CONF_FOUND" = "true" ]; then
-#  setup_moonraker_nginx_cfg
+#     if grep "trusted_clients:" ${HOME}/moonraker.conf -q; then
-#  #backup a possible existing printer.cfg at the old location and before patching in the new location
+#       TC_LINE=$(grep -n "trusted_clients:" ${HOME}/moonraker.conf | cut -d ":" -f1)
-#  backup_printer_cfg
+#       FIRST_IP_LINE=$(expr $TC_LINE + 1)
-#  patch_klipper_sysfile "moonraker"
+#       FIRST_IP=$(sed -n "$FIRST_IP_LINE"p ${HOME}/moonraker.conf | cut -d" " -f5)
-#  #re-run printer.cfg location function to read the new path for the printer.cfg
+#       #if [[ ! $FIRST_IP =~ ([0-9].[0-9].[0-9].[0-9]) ]]; then
-#  locate_printer_cfg
+#       if [ "$FIRST_IP" = "" ]; then
-#  echo; ok_msg "Moonraker successfully installed!"
+#         status_msg "Writing trusted clients to config ..."
-#}
+#         backup_moonraker_conf && write_default_trusted_clients
+#         ok_msg "Trusted clients written!"
+#       fi
+#     fi
+#   fi
+# }
 
-patch_klipper_sysfile(){
+# #############################################################
-  if [ -e $KLIPPER_SERVICE3 ]; then
+# #############################################################
-    status_msg "Checking /etc/systemd/system/klipper.service for necessary entries ..."
-    #patching new printer.cfg location to /etc/systemd/system/klipper.service
-    if [ "$1" = "moonraker" ]; then
-      if ! grep -q "/klipper_config/printer.cfg" $KLIPPER_SERVICE3; then
-        status_msg "Patching new printer.cfg location to /etc/systemd/system/klipper.service ..."
-        sudo sed -i "/ExecStart=/ s|$PRINTER_CFG|/home/${USER}/klipper_config/printer.cfg|" $KLIPPER_SERVICE3
-        ok_msg "New location is: '/home/${USER}/klipper_config/printer.cfg'"
-        #set variable if file got edited
-        SERVICE_FILE_PATCHED="true"
-      fi
-    fi
-    #patching new UDS argument to /etc/systemd/system/klipper.service
-    if [ "$1" = "moonraker" ] || [ "$1" = "dwc2" ]; then
-      if ! grep -q -- "-a /tmp/klippy_uds" $KLIPPER_SERVICE3; then
-        status_msg "Patching unix domain socket to /etc/systemd/system/klipper.service ..."
-        #append the new argument to /tmp/klippy.log argument
-        sudo sed -i "/ExecStart/s/\.log/\.log -a \/tmp\/klippy_uds/" $KLIPPER_SERVICE3
-        ok_msg "Patching done!"
-        #set variable if file got edited
-        SERVICE_FILE_PATCHED="true"
-      fi
-    fi
-    #reloading the units is only needed when the service file was patched.
-    [ "$SERVICE_FILE_PATCHED" = "true" ] && status_msg "Reloading unit ..." && sudo systemctl daemon-reload
-  fi
-  ok_msg "Check complete!"
-  echo
-}
 
-check_for_folder_moonraker(){
+# custom_trusted_clients(){
-  #check for / create sdcard folder
+#   if [ "$ADD_TRUSTED_CLIENT" = "true" ]; then
-  if [ ! -d ${HOME}/sdcard ]; then
+#     unset trusted_arr
-    status_msg "Creating sdcard directory ..."
+#     echo
-    mkdir ${HOME}/sdcard
+#     top_border
-    ok_msg "sdcard directory created!"
+#     echo -e "|  You can now add additional trusted clients to your   |"
-  fi
+#     echo -e "|  moonraker.conf file. Be warned, that there is no     |"
-  ##check for / create klipper_config folder
+#     echo -e "|  spellcheck to check for valid input.                 |"
-  if [ ! -d ${HOME}/klipper_config ]; then
+#     echo -e "|  Make sure to type the IP correct!                    |"
-    status_msg "Creating klipper_config directory ..."
+#     echo -e "|                                                       |"
-    mkdir ${HOME}/klipper_config
+#     echo -e "|  If you want to add IP ranges, you can type in e.g.:  |"
-    ok_msg "klipper_config directory created!"
+#     echo -e "|  192.168.1.0/24                                       |"
-  fi
+#     echo -e "|  This will add the IPs 192.168.1.1 to 192.168.1.254   |"
-}
+#     echo -e "|-------------------------------------------------------|"
+#     echo -e "|  You can add as many IPs / IP ranges as you want.     |"
+#     echo -e "|  When you are done type '${cyan}done${default}' to exit this dialoge.  |"
+#     bottom_border
+#     while true; do
+#       read -p "${cyan}###### Enter IP and press ENTER:${default} " TRUSTED_IP
+#       case "$TRUSTED_IP" in
+#         done)
+#           echo
+#           echo -e "List of IPs to add:"
+#           for ip in ${trusted_arr[@]}
+#           do
+#             echo -e "${cyan}● $ip ${default}"
+#           done
+#           while true; do
+#             echo
+#             echo -e "Select 'Yes' to confirm, 'No' to start again"
+#             echo -e "or 'Q' to abort and skip."
+#             read -p "${cyan}###### Confirm writing (Y/n/q):${default} " yn
+#             case "$yn" in
+#               Y|y|Yes|yes|"")
+#                 echo -e "###### > Yes"
+#                 TUSTED_CLIENT_CONFIRM="true"
+#                 break;;
+#               N|n|No|no)
+#                 echo -e "###### > No"
+#                 custom_trusted_clients
+#                 break;;
+#               Q|q)
+#                 unset trusted_arr
+#                 echo -e "###### > Abort"
+#                 echo -e "${red}Aborting ...${default}"
+#                 break;;
+#             esac
+#           done
+#           break;;
+#         *)
+#           trusted_arr+=($TRUSTED_IP);;
+#       esac
+#     done
+#   fi
+# }
 
-#############################################################
+# write_custom_trusted_clients(){
-#############################################################
+#   if [ "$TUSTED_CLIENT_CONFIRM" = "true" ]; then
-
+#     if [ "${#trusted_arr[@]}" != "0" ]; then
-setup_printer_config_moonraker(){
+#       for ip in ${trusted_arr[@]}
-  if [ "$PRINTER_CFG_FOUND" = "true" ]; then
+#       do
-    #copy printer.cfg to new location if there is no printer.cfg at the new location already
+#         sed -i "/trusted_clients\:/a \ \ \ \ $ip" ${HOME}/moonraker.conf
-    if [ -f ${HOME}/printer.cfg ] && [ ! -f ${HOME}/klipper_config/printer.cfg ]; then
+#       done
-      status_msg "Copy printer.cfg to new location ..."
+#       ok_msg "Custom IPs written to moonraker.conf!"
-      cp ${HOME}/printer.cfg $PRINTER_CFG
+#     fi
-      ok_msg "printer.cfg location: '$PRINTER_CFG'"
+#   fi
-      ok_msg "Done!"
+# }
-    fi
-    #check printer.cfg for necessary moonraker entries
-    read_printer_cfg "moonraker" && write_printer_cfg
-  fi
-  if [ "$SEL_DEF_CFG" = "true" ]; then
-    status_msg "Creating minimal default printer.cfg ..."
-    create_minimal_cfg
-    ok_msg "printer.cfg location: '$PRINTER_CFG'"
-    ok_msg "Done!"
-  fi
-}
-
-setup_moonraker_conf(){
-  if [ "$MOONRAKER_CONF_FOUND" = "false" ]; then
-    status_msg "Creating moonraker.conf ..."
-    cp ${HOME}/kiauh/resources/moonraker.conf ${HOME}
-    ok_msg "moonraker.conf created!"
-    status_msg "Writing trusted clients to config ..."
-    write_default_trusted_clients
-    ok_msg "Trusted clients written!"
-  fi
-  #check for at least one trusted client in an already existing moonraker.conf
-  #if no entry is found, write default trusted client
-  if [ "$MOONRAKER_CONF_FOUND" = "true" ]; then
-    if grep "trusted_clients:" ${HOME}/moonraker.conf -q; then
-      TC_LINE=$(grep -n "trusted_clients:" ${HOME}/moonraker.conf | cut -d ":" -f1)
-      FIRST_IP_LINE=$(expr $TC_LINE + 1)
-      FIRST_IP=$(sed -n "$FIRST_IP_LINE"p ${HOME}/moonraker.conf | cut -d" " -f5)
-      #if [[ ! $FIRST_IP =~ ([0-9].[0-9].[0-9].[0-9]) ]]; then
-      if [ "$FIRST_IP" = "" ]; then
-        status_msg "Writing trusted clients to config ..."
-        backup_moonraker_conf && write_default_trusted_clients
-        ok_msg "Trusted clients written!"
-      fi
-    fi
-  fi
-}
-
-setup_moonraker_nginx_cfg(){
-  if [ ! -f $NGINX_CONFD/upstreams.conf ]; then
-    sudo cp ${SRCDIR}/kiauh/resources/moonraker_nginx.cfg $NGINX_CONFD/upstreams.conf
-  fi
-  if [ ! -f $NGINX_CONFD/common_vars.conf ]; then
-    sudo cp ${SRCDIR}/kiauh/resources/common_vars_nginx.cfg $NGINX_CONFD/common_vars.conf
-  fi
-}
-
-#############################################################
-#############################################################
-
-write_default_trusted_clients(){
-  DEFAULT_IP=$(hostname -I)
-  status_msg "Your devices current IP adress is:\n${cyan}● $DEFAULT_IP ${default}"
-  #make IP of the device KIAUH is exectuted on as
-  #default trusted client and expand the IP range from 0 - 255
-  DEFAULT_IP_RANGE="$(echo "$DEFAULT_IP" | cut -d"." -f1-3).0/24"
-  status_msg "Writing the following IP range to moonraker.conf:\n${cyan}● $DEFAULT_IP_RANGE ${default}"
-  #write the ip range in the first line below "trusted clients"
-  #example: 192.168.1.0/24
-  sed -i "/trusted_clients\:/a \ \ \ \ $DEFAULT_IP_RANGE" ${HOME}/moonraker.conf
-  ok_msg "IP range of ● $DEFAULT_IP_RANGE written to moonraker.conf!"
-}
-
-#############################################################
-#############################################################
-
-custom_trusted_clients(){
-  if [ "$ADD_TRUSTED_CLIENT" = "true" ]; then
-    unset trusted_arr
-    echo
-    top_border
-    echo -e "|  You can now add additional trusted clients to your   |"
-    echo -e "|  moonraker.conf file. Be warned, that there is no     |"
-    echo -e "|  spellcheck to check for valid input.                 |"
-    echo -e "|  Make sure to type the IP correct!                    |"
-    echo -e "|                                                       |"
-    echo -e "|  If you want to add IP ranges, you can type in e.g.:  |"
-    echo -e "|  192.168.1.0/24                                       |"
-    echo -e "|  This will add the IPs 192.168.1.1 to 192.168.1.254   |"
-    echo -e "|-------------------------------------------------------|"
-    echo -e "|  You can add as many IPs / IP ranges as you want.     |"
-    echo -e "|  When you are done type '${cyan}done${default}' to exit this dialoge.  |"
-    bottom_border
-    while true; do
-      read -p "${cyan}###### Enter IP and press ENTER:${default} " TRUSTED_IP
-      case "$TRUSTED_IP" in
-        done)
-          echo
-          echo -e "List of IPs to add:"
-          for ip in ${trusted_arr[@]}
-          do
-            echo -e "${cyan}● $ip ${default}"
-          done
-          while true; do
-            echo
-            echo -e "Select 'Yes' to confirm, 'No' to start again"
-            echo -e "or 'Q' to abort and skip."
-            read -p "${cyan}###### Confirm writing (Y/n/q):${default} " yn
-            case "$yn" in
-              Y|y|Yes|yes|"")
-                echo -e "###### > Yes"
-                TUSTED_CLIENT_CONFIRM="true"
-                break;;
-              N|n|No|no)
-                echo -e "###### > No"
-                custom_trusted_clients
-                break;;
-              Q|q)
-                unset trusted_arr
-                echo -e "###### > Abort"
-                echo -e "${red}Aborting ...${default}"
-                break;;
-            esac
-          done
-          break;;
-        *)
-          trusted_arr+=($TRUSTED_IP);;
-      esac
-    done
-  fi
-}
-
-write_custom_trusted_clients(){
-  if [ "$TUSTED_CLIENT_CONFIRM" = "true" ]; then
-    if [ "${#trusted_arr[@]}" != "0" ]; then
-      for ip in ${trusted_arr[@]}
-      do
-        sed -i "/trusted_clients\:/a \ \ \ \ $ip" ${HOME}/moonraker.conf
-      done
-      ok_msg "Custom IPs written to moonraker.conf!"
-    fi
-  fi
-}
-
-symlinks_moonraker(){
-  #create a klippy.log/moonraker.log symlink in klipper_config-dir just for convenience
-  if [ "$SEL_KLIPPYLOG_SL" = "true" ] && [ ! -e ${HOME}/klipper_config/klippy.log ]; then
-    status_msg "Creating klippy.log symlink ..."
-    ln -s /tmp/klippy.log ${HOME}/klipper_config
-    ok_msg "Symlink created!"
-  fi
-  if [ "$SEL_MRLOG_SL" = "true" ] && [ ! -e ${HOME}/klipper_config/moonraker.log ]; then
-    status_msg "Creating moonraker.log symlink ..."
-    ln -s /tmp/moonraker.log ${HOME}/klipper_config
-    ok_msg "Symlink created!"
-  fi
-}
-
-handle_haproxy_lighttpd(){
-  #handle haproxy
-  if [ "$DISABLE_HAPROXY" = "true" ]; then
-    if systemctl is-active haproxy -q; then
-      status_msg "Stopping haproxy service ..."
-      sudo /etc/init.d/haproxy stop && ok_msg "Service stopped!"
-    fi
-    sudo systemctl disable haproxy
-    ok_msg "Haproxy service disabled!"
-  else
-    if [ "$REMOVE_HAPROXY" = "true" ]; then
-      if systemctl is-active haproxy -q; then
-        status_msg "Stopping haproxy service ..."
-        sudo /etc/init.d/haproxy stop && ok_msg "Service stopped!"
-      fi
-      status_msg "Removing haproxy ..."
-      sudo apt-get remove haproxy -y
-      sudo update-rc.d -f haproxy remove
-      ok_msg "Haproxy removed!"
-    fi
-  fi
-  #handle lighttpd
-  if [ "$DISABLE_LIGHTTPD" = "true" ]; then
-    if systemctl is-active lighttpd -q; then
-      status_msg "Stopping lighttpd service ..."
-      sudo /etc/init.d/lighttpd stop && ok_msg "Service stopped!"
-    fi
-    sudo systemctl disable lighttpd
-    ok_msg "Lighttpd service disabled!"
-  else
-    if [ "$REMOVE_LIGHTTPD" = "true" ]; then
-      if systemctl is-active lighttpd -q; then
-        status_msg "Stopping lighttpd service ..."
-        sudo /etc/init.d/lighttpd stop && ok_msg "Service stopped!"
-      fi
-      status_msg "Removing lighttpd ..."
-      sudo apt-get remove lighttpd -y
-      sudo update-rc.d -f lighttpd remove
-      ok_msg "Lighttpd removed!"
-    fi
-  fi
-}