diff --git a/src/modules/fluidd/start_chroot_script b/src/modules/fluidd/start_chroot_script index eb179eb..2b33e95 100644 --- a/src/modules/fluidd/start_chroot_script +++ b/src/modules/fluidd/start_chroot_script @@ -31,10 +31,10 @@ su -c "unzip fluidd.zip -d /home/pi/fluidd" - pi rm /home/pi/fluidd.zip # link logfiles to klipper_logs -ln -s /var/log/nginx/fluidd-access.log /home/pi/klipper_logs/ -ln -s /var/log/nginx/fluidd-error.log /home/pi/klipper_logs/ +ln -s /var/log/nginx/fluidd-access.log /var/log/klipper/ +ln -s /var/log/nginx/fluidd-error.log /var/log/klipper/ # Run installation steps defined above # Unpack root at the end, so files are modified before -unpack /filesystem/root / \ No newline at end of file +unpack /filesystem/root / diff --git a/src/modules/klipper/filesystem/root/etc/logrotate.d/klipper b/src/modules/klipper/filesystem/root/etc/logrotate.d/klipper index 68047d4..06f63e1 100644 --- a/src/modules/klipper/filesystem/root/etc/logrotate.d/klipper +++ b/src/modules/klipper/filesystem/root/etc/logrotate.d/klipper @@ -1,9 +1,8 @@ - -/home/pi/klipper_logs/klippy.log +/var/log/klipper/klippy.log { rotate 7 daily - maxsize 64M + maxsize 16M missingok notifempty compress diff --git a/src/modules/klipper/filesystem/root/etc/systemd/system/klipper.service b/src/modules/klipper/filesystem/root/etc/systemd/system/klipper.service index 95d6d00..4e422d7 100644 --- a/src/modules/klipper/filesystem/root/etc/systemd/system/klipper.service +++ b/src/modules/klipper/filesystem/root/etc/systemd/system/klipper.service @@ -11,6 +11,6 @@ WantedBy=multi-user.target Type=simple User=pi RemainAfterExit=yes -ExecStart=/home/pi/klippy-env/bin/python /home/pi/klipper/klippy/klippy.py /home/pi/klipper_config/printer.cfg -l /home/pi/klipper_logs/klippy.log -a /tmp/klippy_uds +ExecStart=/home/pi/klippy-env/bin/python /home/pi/klipper/klippy/klippy.py /home/pi/klipper_config/printer.cfg -l /var/log/klipper/klippy.log -a /tmp/klippy_uds Restart=always -RestartSec=10 \ No newline at end of file +RestartSec=10 diff --git a/src/modules/klipper/filesystem/root/etc/tmpfiles.d/klipper.conf b/src/modules/klipper/filesystem/root/etc/tmpfiles.d/klipper.conf new file mode 100644 index 0000000..fd4d111 --- /dev/null +++ b/src/modules/klipper/filesystem/root/etc/tmpfiles.d/klipper.conf @@ -0,0 +1 @@ +d /var/log/klipper 0755 pi pi - - diff --git a/src/modules/klipper/start_chroot_script b/src/modules/klipper/start_chroot_script index 0fb3f6a..78a1866 100644 --- a/src/modules/klipper/start_chroot_script +++ b/src/modules/klipper/start_chroot_script @@ -44,7 +44,15 @@ cd /home/pi gitclone KLIPPER_REPO klipper [ ! -d /home/pi/klipper_config ] && su -c "mkdir /home/pi/klipper_config" - pi -[ ! -d /home/pi/klipper_logs ] && su -c "mkdir /home/pi/klipper_logs" - pi + +# mount rotate files in RAM +# tmpfs /var/log tmpfs nodev,nosuid 0 0 +# tmpfs /var/tmp tmpfs nodev,nosuid 0 0 +# tmpfs /tmp tmpfs nodev,nosuid 0 0 +append1 /etc/fstab "/var/log" "tmpfs /var/log tmpfs nodev,nosuid 0 0" +append1 /etc/fstab "/var/tmp" "tmpfs /var/tmp tmpfs nodev,nosuid 0 0" +append1 /etc/fstab "\s/tmp" "tmpfs /tmp tmpfs nodev,nosuid 0 0" + # create python virtualenv and install klipper requirements su -c "virtualenv -p python2 ${KLIPPER_PYTHON_DIR}" - pi diff --git a/src/modules/mjpgstreamer/filesystem/root/etc/logrotate.d/webcamd b/src/modules/mjpgstreamer/filesystem/root/etc/logrotate.d/webcamd index bf135d2..0043b7e 100644 --- a/src/modules/mjpgstreamer/filesystem/root/etc/logrotate.d/webcamd +++ b/src/modules/mjpgstreamer/filesystem/root/etc/logrotate.d/webcamd @@ -1,9 +1,8 @@ - /var/log/webcamd.log { rotate 4 weekly - maxsize 64M + maxsize 16M missingok notifempty compress diff --git a/src/modules/mjpgstreamer/filesystem/root/etc/tmpfiles.d/mjpq_streamer.conf b/src/modules/mjpgstreamer/filesystem/root/etc/tmpfiles.d/mjpq_streamer.conf new file mode 100644 index 0000000..93a6d4c --- /dev/null +++ b/src/modules/mjpgstreamer/filesystem/root/etc/tmpfiles.d/mjpq_streamer.conf @@ -0,0 +1 @@ +L /var/log/klipper/webcamd.log - - - - /var/log/webcamd.log diff --git a/src/modules/mjpgstreamer/start_chroot_script b/src/modules/mjpgstreamer/start_chroot_script index eb12839..deeca79 100644 --- a/src/modules/mjpgstreamer/start_chroot_script +++ b/src/modules/mjpgstreamer/start_chroot_script @@ -82,9 +82,6 @@ fi apt-get clean apt-get autoremove -y -# link logfiles to klipper_logs -ln -s /var/log/webcamd.log /home/pi/klipper_logs/ - # Run installation steps defined above # Unpack root at the end, so files are modified before diff --git a/src/modules/moonraker/filesystem/home/pi/klipper_config/moonraker.conf b/src/modules/moonraker/filesystem/home/pi/klipper_config/moonraker.conf index d89910b..32d4689 100644 --- a/src/modules/moonraker/filesystem/home/pi/klipper_config/moonraker.conf +++ b/src/modules/moonraker/filesystem/home/pi/klipper_config/moonraker.conf @@ -5,7 +5,7 @@ enable_debug_logging: False config_path: ~/klipper_config temperature_store_size: 600 gcode_store_size: 1000 -log_path: ~/klipper_logs +log_path: /var/log/klipper [authorization] force_logins: True @@ -37,4 +37,4 @@ enable_auto_refresh: True [update_manager client fluidd] type: web repo: fluidd-core/fluidd -path: ~/fluidd \ No newline at end of file +path: ~/fluidd diff --git a/src/modules/moonraker/filesystem/root/etc/logrotate.d/moonraker b/src/modules/moonraker/filesystem/root/etc/logrotate.d/moonraker index d293155..fbcd5b9 100644 --- a/src/modules/moonraker/filesystem/root/etc/logrotate.d/moonraker +++ b/src/modules/moonraker/filesystem/root/etc/logrotate.d/moonraker @@ -1,9 +1,8 @@ - -/home/pi/klipper_logs/moonraker.log +/var/log/klipper/moonraker.log { rotate 7 daily - maxsize 64M + maxsize 16M missingok notifempty compress diff --git a/src/modules/moonraker/filesystem/root/etc/systemd/system/moonraker.service b/src/modules/moonraker/filesystem/root/etc/systemd/system/moonraker.service index db5e5a0..35ea6c9 100644 --- a/src/modules/moonraker/filesystem/root/etc/systemd/system/moonraker.service +++ b/src/modules/moonraker/filesystem/root/etc/systemd/system/moonraker.service @@ -11,6 +11,6 @@ WantedBy=multi-user.target Type=simple User=pi RemainAfterExit=yes -ExecStart=/home/pi/moonraker-env/bin/python /home/pi/moonraker/moonraker/moonraker.py -c /home/pi/klipper_config/moonraker.conf -l /home/pi/klipper_logs/moonraker.log +ExecStart=/home/pi/moonraker-env/bin/python /home/pi/moonraker/moonraker/moonraker.py -c /home/pi/klipper_config/moonraker.conf -l /var/log/klipper/moonraker.log Restart=always -RestartSec=10 \ No newline at end of file +RestartSec=10