From 6254b504547cea5ebe0ac4d4fdb2bf480f62c6f4 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sat, 7 Jan 2023 18:29:43 +0100 Subject: [PATCH] refactor: apply moonraker path changes (#14) --- .gitignore | 4 ++-- config/supervisord.conf | 6 +++--- docker-compose.yml | 7 +------ example-configs/moonraker.conf | 10 ++-------- example-configs/printer.cfg | 4 ++-- scripts/start.sh | 29 +++++++++++++++-------------- 6 files changed, 25 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index f1fa793..5163059 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/printer -/printer_storage \ No newline at end of file +.idea +/printer_data \ No newline at end of file diff --git a/config/supervisord.conf b/config/supervisord.conf index cc071ea..c867f6c 100644 --- a/config/supervisord.conf +++ b/config/supervisord.conf @@ -1,5 +1,5 @@ [supervisord] -logfile=/home/printer/klipper_logs/supervisord.log ; (main log file;default $CWD/supervisord.log) +logfile=/home/printer/printer_data/logs/supervisord.log ; (main log file;default $CWD/supervisord.log) logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB) logfile_backups=10 ; (num of main logfile rotation backups;default 10) loglevel=info ; (log level;default info; others: debug,warn,trace) @@ -28,7 +28,7 @@ autorestart=true redirect_stderr=true [program:klipper] -command=/home/printer/klippy-env/bin/python /home/printer/klipper/klippy/klippy.py /home/printer/klipper_config/printer.cfg -l /home/printer/klipper_logs/klippy.log -a /tmp/klippy_uds +command=/home/printer/klippy-env/bin/python /home/printer/klipper/klippy/klippy.py /home/printer/printer_data/config/printer.cfg -l /home/printer/printer_data/logs/klippy.log -a /home/printer/printer_data/comms/klippy.sock user=printer process_name=klipper directory=/home/printer @@ -37,7 +37,7 @@ autorestart=true redirect_stderr=true [program:moonraker] -command=/home/printer/moonraker-env/bin/python /home/printer/moonraker/moonraker/moonraker.py -l /home/printer/klipper_logs/moonraker.log -c /home/printer/klipper_config/moonraker.conf +command=/home/printer/moonraker-env/bin/python /home/printer/moonraker/moonraker/moonraker.py -d /home/printer/printer_data user=printer process_name=moonraker directory=/home/printer diff --git a/docker-compose.yml b/docker-compose.yml index 598ce4d..be194e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,12 +6,7 @@ services: context: . dockerfile: Dockerfile volumes: - - ./printer_storage/.moonraker_database:/home/printer/.moonraker_database:delegated - - ./printer_storage/gcode_files:/home/printer/gcode_files:delegated - - ./printer_storage/klipper_config:/home/printer/klipper_config:delegated - - ./printer_storage/klipper_logs:/home/printer/klipper_logs:delegated - - ./printer_storage/webcam_images:/home/printer/webcam_images:delegated - - ./printer_storage/timelapse:/home/printer/timelapse:delegated + - ./printer_data:/home/printer/printer_data:delegated ports: - "7125:7125" - "8110:8080" diff --git a/example-configs/moonraker.conf b/example-configs/moonraker.conf index aa9ec6e..5070430 100644 --- a/example-configs/moonraker.conf +++ b/example-configs/moonraker.conf @@ -1,22 +1,17 @@ [machine] provider: systemd_cli +validate_service: False [server] host: 0.0.0.0 port: 7125 -klippy_uds_address: /tmp/klippy_uds -enable_debug_logging: False - -[database] -database_path: ~/.moonraker_database +klippy_uds_address: ~/printer_data/comms/klippy.sock [data_store] temperature_store_size: 1200 gcode_store_size: 1000 [file_manager] -log_path: ~/klipper_logs -config_path: ~/klipper_config enable_object_processing: True [authorization] @@ -42,6 +37,5 @@ subscriptions: mainsail [update_manager] -enable_repo_debug: True refresh_interval: 24 channel: dev diff --git a/example-configs/printer.cfg b/example-configs/printer.cfg index c2d894e..94e3a27 100644 --- a/example-configs/printer.cfg +++ b/example-configs/printer.cfg @@ -29,7 +29,7 @@ #[include addons/temp_sensors.cfg] # Miscellaneous (only one active config allowed at a time) -[include addons/miscellaneous.cfg.cfg] # [fan], [heater_fan], [controller_fan], [filament_runout_sensor], [output_pin] +[include addons/miscellaneous.cfg] # [fan], [heater_fan], [controller_fan], [filament_runout_sensor], [output_pin] #[include addons/led_neopixel.cfg] # [neopixel], [led] # Moonraker Plugins @@ -48,7 +48,7 @@ serial: /tmp/pseudoserial restart_method: arduino [virtual_sdcard] -path: ~/gcode_files +path: ~/printer_data/gcodes [firmware_retraction] retract_length: 0.5 diff --git a/scripts/start.sh b/scripts/start.sh index 994f9d1..a3cec13 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -13,12 +13,13 @@ set -e REQUIRED_FOLDERS=( - "${HOME}/klipper_config" - "${HOME}/klipper_logs" - "${HOME}/gcode_files" - "${HOME}/webcam_images" - "${HOME}/timelapse" - "${HOME}/.moonraker_database" + "${HOME}/printer_data" + "${HOME}/printer_data/config" + "${HOME}/printer_data/logs" + "${HOME}/printer_data/gcodes" + "${HOME}/printer_data/webcam_images" + "${HOME}/printer_data/timelapse" + "${HOME}/printer_data/database" ) function status_msg() { @@ -40,13 +41,13 @@ function check_folder_perms() { } ###### -# Copy example configs if ~/klipper_config is empty +# Copy example configs if ~/printer_data/config is empty ### function copy_example_configs() { - if [[ ! "$(ls -A "${HOME}/klipper_config")" ]]; then - status_msg "Directory ${HOME}/klipper_config is empty!" + if [[ ! "$(ls -A "${HOME}/printer_data/config")" ]]; then + status_msg "Directory ${HOME}/printer_data/config is empty!" status_msg "Copy example configs ..." - cp -R ~/example-configs/* ~/klipper_config + cp -R ~/example-configs/* ~/printer_data/config status_msg "OK!" fi } @@ -55,10 +56,10 @@ function copy_example_configs() { # Copy dummy images if ~/webcam_images is empty ### function copy_dummy_images() { - if [[ ! "$(ls -A "${HOME}/webcam_images")" ]]; then - status_msg "Directory ${HOME}/webcam_images is empty!" + if [[ ! "$(ls -A "${HOME}/printer_data/webcam_images")" ]]; then + status_msg "Directory ${HOME}/printer_data/webcam_images is empty!" status_msg "Copy dummy images ..." - cp -R ~/mjpg_streamer_images/*.jpg ~/webcam_images + cp -R ~/mjpg_streamer_images/*.jpg ~/printer_data/webcam_images status_msg "OK!" fi } @@ -70,7 +71,7 @@ function link_timelapse() { local component_source="${HOME}/moonraker-timelapse/component/timelapse.py" local component_target="${HOME}/moonraker/moonraker/components/timelapse.py" local macro_source="${HOME}/moonraker-timelapse/klipper_macro/timelapse.cfg" - local macro_target="${HOME}/klipper_config/addons/timelapse.cfg" + local macro_target="${HOME}/printer_data/config/addons/timelapse.cfg" if [[ -f ${component_source} && ! -h ${component_target} ]]; then status_msg "Linking moonraker-timelapse component ..."