diff options
| author | Guy Sheffer <guysoft@gmail.com> | 2020-07-05 02:03:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 02:03:52 +0300 |
| commit | bc295176981ee46a7a7d839173b9806ae15adfb3 (patch) | |
| tree | c77dc1a1626a59830f8d912692e4d00d427b0099 | |
| parent | 04e910f759a670542bdf96256626703a820ffa25 (diff) | |
| parent | 7acd71e2491e658444f436677c1d05099fdd32cd (diff) | |
Merge pull request #660 from guysoft/fix/webcam_leftovers
Fix webcamd issues
4 files changed, 3 insertions, 15 deletions
diff --git a/src/modules/octopi/filesystem/root/etc/default/webcamd b/src/modules/octopi/filesystem/root/etc/default/webcamd deleted file mode 100644 index cdbae57..0000000 --- a/src/modules/octopi/filesystem/root/etc/default/webcamd +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration for /etc/init.d/webcamd - -# Daemon -DAEMON=/root/bin/webcamd - -# Log file to use -LOG=/var/log/webcamd.log - -# User to run under -USER=pi - -# Should we run at startup? -ENABLED=1 diff --git a/src/modules/octopi/filesystem/root/etc/logrotate.d/webcamd b/src/modules/octopi/filesystem/root/etc/logrotate.d/webcamd index 5c148ac..2c5b5c6 100644 --- a/src/modules/octopi/filesystem/root/etc/logrotate.d/webcamd +++ b/src/modules/octopi/filesystem/root/etc/logrotate.d/webcamd @@ -1,4 +1,4 @@ -/var/log/webcam.log +/var/log/webcamd.log { rotate 4 weekly diff --git a/src/modules/octopi/filesystem/root/etc/systemd/system/webcamd.service b/src/modules/octopi/filesystem/root/etc/systemd/system/webcamd.service index 5336380..2416f57 100644 --- a/src/modules/octopi/filesystem/root/etc/systemd/system/webcamd.service +++ b/src/modules/octopi/filesystem/root/etc/systemd/system/webcamd.service @@ -4,6 +4,8 @@ ConditionPathExists=/etc/octopi_streamer/mjpeg [Service] WorkingDirectory=/root/bin +StandardOutput=append:/var/log/webcamd.log +StandardError=append:/var/log/webcamd.log ExecStart=/root/bin/webcamd Restart=always Type=forking diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script index 22b62d3..c587918 100755 --- a/src/modules/octopi/start_chroot_script +++ b/src/modules/octopi/start_chroot_script @@ -256,7 +256,6 @@ then else rm /etc/logrotate.d/webcamd rm /etc/systemd/system/webcamd.service - rm /etc/default/webcamd rm /root/bin/webcamd fi |