diff --git a/roles/fetlab/files/motion.conf b/roles/fetlab/files/motion.conf index 43d7236..6d571cb 100644 --- a/roles/fetlab/files/motion.conf +++ b/roles/fetlab/files/motion.conf @@ -6,9 +6,12 @@ # @normal_username user -thread thread-1.conf webcontrol_html_output on webcontrol_port 7999 setup_mode off webcontrol_parms 2 webcontrol_localhost on + +thread thread-1.conf +thread thread-2.conf +thread thread-3.conf diff --git a/roles/fetlab/files/thread-1.conf b/roles/fetlab/files/thread-1.conf index 48ba3fb..bd7a8b3 100644 --- a/roles/fetlab/files/thread-1.conf +++ b/roles/fetlab/files/thread-1.conf @@ -7,7 +7,7 @@ # @motion_detection on # @upload_port # @upload_location -# @preserve_movies 0 +# @preserve_movies 99 # @network_username # @upload_movie on # @id 1 @@ -19,7 +19,7 @@ # @network_password # @upload_service ftp # @name Camera1 -# @preserve_pictures 0 +# @preserve_pictures 365 # @storage_device custom-path # @manual_snapshots on # @network_share_name @@ -31,7 +31,7 @@ ffmpeg_output_movies on height 576 stream_quality 85 -threshold 12960 +threshold 4147 quality 85 noise_level 31 ffmpeg_output_debug_movies off @@ -44,7 +44,7 @@ hue 0 saturation 0 stream_localhost on ffmpeg_variable_bitrate 75 -ffmpeg_video_codec mp4:h264_omx +ffmpeg_video_codec mp4 text_changes off movie_filename %Y-%m-%d/%H-%M-%S auto_brightness off @@ -62,7 +62,7 @@ stream_motion off target_dir /var/lib/motioneye/Camera1 text_double on post_capture 1 -stream_authentication user: +stream_authentication user:da559fac89e576192f868ff898652ec74cb7b4d6 output_debug_pictures off on_picture_save /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" picture_save %t %f on_movie_end /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" movie_end %t %f @@ -71,7 +71,7 @@ picture_filename %Y-%m-%d/%H-%M-%S locate_motion_style redbox locate_motion_mode off contrast 0 -videodevice /dev/v4l/by-id/usb-1b80_USB_2861_Device-video-index0 +videodevice /dev/video0 max_movie_time 0 on_event_end /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" stop %t text_right %Y-%m-%d\n%T diff --git a/roles/fetlab/files/thread-2.conf b/roles/fetlab/files/thread-2.conf new file mode 100644 index 0000000..7a72649 --- /dev/null +++ b/roles/fetlab/files/thread-2.conf @@ -0,0 +1,82 @@ +# @webcam_resolution 100 +# @upload_subfolders on +# @upload_server +# @enabled on +# @network_server +# @upload_username +# @motion_detection on +# @upload_port +# @upload_location +# @preserve_movies 99 +# @network_username +# @upload_movie on +# @id 2 +# @manual_record off +# @upload_password +# @upload_method post +# @upload_picture on +# @working_schedule_type outside +# @network_password +# @upload_service ftp +# @name Camera2 +# @preserve_pictures 365 +# @storage_device custom-path +# @manual_snapshots on +# @network_share_name +# @upload_enabled off +# @webcam_server_resize off +# @working_schedule + + +ffmpeg_output_movies on +height 576 +stream_quality 85 +threshold 4147 +quality 85 +noise_level 31 +ffmpeg_output_debug_movies off +pre_capture 1 +noise_tune on +smart_mask_speed 0 +stream_maxrate 5 +output_pictures on +hue 0 +saturation 0 +stream_localhost on +ffmpeg_variable_bitrate 75 +ffmpeg_video_codec mp4 +text_changes off +movie_filename %Y-%m-%d/%H-%M-%S +auto_brightness off +stream_port 8082 +rotate 180 +brightness 0 +lightswitch 0 +framerate 2 +emulate_motion off +snapshot_filename %Y-%m-%d/%H-%M-%S +despeckle_filter +snapshot_interval 0 +stream_auth_method 0 +stream_motion off +target_dir /var/lib/motioneye/Camera2 +text_double on +post_capture 1 +stream_authentication user:da559fac89e576192f868ff898652ec74cb7b4d6 +output_debug_pictures off +on_picture_save /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" picture_save %t %f +on_movie_end /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" movie_end %t %f +text_left Camera2 +picture_filename %Y-%m-%d/%H-%M-%S +locate_motion_style redbox +locate_motion_mode off +contrast 0 +videodevice /dev/video1 +max_movie_time 0 +on_event_end /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" stop %t +text_right %Y-%m-%d\n%T +on_event_start /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" start %t +event_gap 30 +minimum_motion_frames 20 +mask_file +width 720 diff --git a/roles/fetlab/files/thread-3.conf b/roles/fetlab/files/thread-3.conf new file mode 100644 index 0000000..0bb0a13 --- /dev/null +++ b/roles/fetlab/files/thread-3.conf @@ -0,0 +1,82 @@ +# @webcam_resolution 100 +# @upload_subfolders on +# @upload_server +# @enabled on +# @network_server +# @upload_username +# @motion_detection on +# @upload_port +# @upload_location +# @preserve_movies 99 +# @network_username +# @upload_movie on +# @id 3 +# @manual_record off +# @upload_password +# @upload_method post +# @upload_picture on +# @working_schedule_type outside +# @network_password +# @upload_service ftp +# @name Camera3 +# @preserve_pictures 365 +# @storage_device custom-path +# @manual_snapshots on +# @network_share_name +# @upload_enabled off +# @webcam_server_resize off +# @working_schedule + + +ffmpeg_output_movies on +height 576 +stream_quality 85 +threshold 4147 +quality 85 +noise_level 31 +ffmpeg_output_debug_movies off +pre_capture 1 +noise_tune on +smart_mask_speed 0 +stream_maxrate 5 +output_pictures on +hue 0 +saturation 0 +stream_localhost on +ffmpeg_variable_bitrate 75 +ffmpeg_video_codec mp4 +text_changes off +movie_filename %Y-%m-%d/%H-%M-%S +auto_brightness off +stream_port 8083 +rotate 180 +brightness 0 +lightswitch 0 +framerate 2 +emulate_motion off +snapshot_filename %Y-%m-%d/%H-%M-%S +despeckle_filter +snapshot_interval 0 +stream_auth_method 0 +stream_motion off +target_dir /var/lib/motioneye/Camera3 +text_double on +post_capture 1 +stream_authentication user:da559fac89e576192f868ff898652ec74cb7b4d6 +output_debug_pictures off +on_picture_save /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" picture_save %t %f +on_movie_end /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" movie_end %t %f +text_left Camera3 +picture_filename %Y-%m-%d/%H-%M-%S +locate_motion_style redbox +locate_motion_mode off +contrast 0 +videodevice /dev/video2 +max_movie_time 0 +on_event_end /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" stop %t +text_right %Y-%m-%d\n%T +on_event_start /usr/local/lib/python2.7/dist-packages/motioneye/scripts/relayevent.sh "/etc/motioneye/motioneye.conf" start %t +event_gap 30 +minimum_motion_frames 20 +mask_file +width 720 diff --git a/roles/fetlab/tasks/motion.yml b/roles/fetlab/tasks/motion.yml index 7c26445..46db5db 100644 --- a/roles/fetlab/tasks/motion.yml +++ b/roles/fetlab/tasks/motion.yml @@ -41,6 +41,8 @@ - motion.conf - motioneye.conf - thread-1.conf + - thread-2.conf + - thread-3.conf notify: restart motioneye - name: motion - copy service file