added https parts site, video site, fixed modsecurity
This commit is contained in:
Bastian de Byl
@@ -1,6 +1,2 @@
|
||||
---
|
||||
deps: [
|
||||
motion
|
||||
]
|
||||
|
||||
motion_target_dir: "{{ nfs_root }}/motion"
|
||||
deps: ["cifs-utils"]
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
---
|
||||
dependencies:
|
||||
- role: nfs
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
---
|
||||
- name: install motion
|
||||
- name: install shinobi dependencies
|
||||
become: true
|
||||
pacman:
|
||||
name: "{{ deps }}"
|
||||
state: present
|
||||
tags: deps
|
||||
tags:
|
||||
- deps
|
||||
- motion
|
||||
|
||||
@@ -1,51 +1,50 @@
|
||||
---
|
||||
- name: give motion user nfs permissions
|
||||
- name: create shinobi user
|
||||
become: true
|
||||
user:
|
||||
name: motion
|
||||
groups: "{{ nfs_group }}"
|
||||
append: true
|
||||
notify:
|
||||
- restart_motion
|
||||
name: "{{ motion_user }}"
|
||||
shell: /bin/nologin
|
||||
tags: motion
|
||||
|
||||
- name: create motion directory
|
||||
- name: mount shinob videos folder
|
||||
become: true
|
||||
file:
|
||||
path: "{{ motion_target_dir }}"
|
||||
path: /mnt/shinobi
|
||||
state: directory
|
||||
owner: "{{ nfs_user }}"
|
||||
group: "{{ nfs_group }}"
|
||||
mode: 0777
|
||||
owner: "{{ motion_user }}"
|
||||
group: "{{ motion_user }}"
|
||||
mode: 0755
|
||||
tags: motion
|
||||
|
||||
- name: template motion config
|
||||
- name: mount smb via cifs
|
||||
become: true
|
||||
template:
|
||||
src: templates/motion.conf.j2
|
||||
dest: /etc/motion/motion.conf
|
||||
mode: 0644
|
||||
backup: true
|
||||
notify:
|
||||
- restart_motion
|
||||
mount:
|
||||
path: /mnt/shinobi
|
||||
src: "//{{ motion_hostname }}/share/GardenCamera"
|
||||
fstype: cifs
|
||||
# yamllint disable-line rule:line-length
|
||||
opts: "username={{ motion_user }},password={{ motion_pass }},workgroup=workgroup,iocharset=utf8,uid={{ motion_user }},gid={{ motion_user }}"
|
||||
state: mounted
|
||||
tags: motion
|
||||
|
||||
- name: create motion systemd override directory
|
||||
- name: create shinobi data volume
|
||||
become: true
|
||||
file:
|
||||
path: /etc/systemd/system/motion.service.d/
|
||||
state: directory
|
||||
mode: 0644
|
||||
docker_volume:
|
||||
name: shinobi_data
|
||||
tags: motion
|
||||
|
||||
- name: template motion systemd override
|
||||
become: true
|
||||
template:
|
||||
src: templates/motion.service.override.j2
|
||||
dest: /etc/systemd/system/motion.service.d/override.conf
|
||||
mode: 0644
|
||||
notify:
|
||||
- restart_motion
|
||||
|
||||
- name: enable (now) motion.service
|
||||
become: true
|
||||
service:
|
||||
name: motion.service
|
||||
state: stopped
|
||||
enabled: false
|
||||
- name: create shinobi server container
|
||||
diff: false
|
||||
docker_container:
|
||||
name: shinobi
|
||||
image: migoller/shinobidocker:latest
|
||||
recreate: true
|
||||
restart: true
|
||||
restart_policy: on-failure
|
||||
restart_retries: 3
|
||||
volumes:
|
||||
- "shinobi_data:/var/lib/mysql"
|
||||
- "/mnt/shinobi:/opt/shinobi/videos"
|
||||
ports:
|
||||
- "8085:8080"
|
||||
tags: motion
|
||||
|
||||
@@ -1,171 +0,0 @@
|
||||
# Rename this distribution example file to motion.conf
|
||||
#
|
||||
# This config file was generated by motion 4.3.2
|
||||
# Documentation: /usr/share/doc/motion/motion_guide.html
|
||||
#
|
||||
# This file contains only the basic configuration options to get a
|
||||
# system working. There are many more options available. Please
|
||||
# consult the documentation for the complete list of all options.
|
||||
#
|
||||
|
||||
############################################################
|
||||
# System control configuration parameters
|
||||
############################################################
|
||||
|
||||
# Start in daemon (background) mode and release terminal.
|
||||
daemon on
|
||||
|
||||
# Start in Setup-Mode, daemon disabled.
|
||||
setup_mode off
|
||||
|
||||
# File to store the process ID.
|
||||
; pid_file value
|
||||
|
||||
# File to write logs messages into. If not defined stderr and syslog is used.
|
||||
; log_file value
|
||||
|
||||
# Level of log messages [1..9] (EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL).
|
||||
log_level 6
|
||||
|
||||
# Target directory for pictures, snapshots and movies
|
||||
target_dir {{ motion_target_dir }}
|
||||
|
||||
# Video device (e.g. /dev/video0) to be used for capturing.
|
||||
; videodevice /dev/video0
|
||||
|
||||
# Parameters to control video device. See motion_guide.html
|
||||
; vid_control_params value
|
||||
|
||||
# The full URL of the network camera stream.
|
||||
netcam_url rtsp://{{ motion_hostname }}:{{ motion_port }}/h264?username={{ motion_user }}&password={{ motion_pass }}
|
||||
|
||||
# Name of mmal camera (e.g. vc.ril.camera for pi camera).
|
||||
; mmalcam_name value
|
||||
|
||||
# Camera control parameters (see raspivid/raspistill tool documentation)
|
||||
; mmalcam_control_params value
|
||||
|
||||
############################################################
|
||||
# Image Processing configuration parameters
|
||||
############################################################
|
||||
|
||||
# Image width in pixels.
|
||||
width 3840
|
||||
|
||||
# Image height in pixels.
|
||||
height 2160
|
||||
|
||||
# Maximum number of frames to be captured per second.
|
||||
framerate 20
|
||||
|
||||
# Text to be overlayed in the lower left corner of images
|
||||
text_left NatureCam
|
||||
|
||||
# Text to be overlayed in the lower right corner of images.
|
||||
text_right %Y-%m-%d\n%T-%q
|
||||
|
||||
############################################################
|
||||
# Motion detection configuration parameters
|
||||
############################################################
|
||||
|
||||
# Always save pictures and movies even if there was no motion.
|
||||
emulate_motion off
|
||||
|
||||
# Threshold for number of changed pixels that triggers motion.
|
||||
threshold 165900
|
||||
|
||||
# Noise threshold for the motion detection.
|
||||
; noise_level 32
|
||||
|
||||
# Despeckle the image using (E/e)rode or (D/d)ilate or (l)abel.
|
||||
despeckle_filter EedDl
|
||||
|
||||
# Number of images that must contain motion to trigger an event.
|
||||
minimum_motion_frames 1
|
||||
|
||||
# Gap in seconds of no motion detected that triggers the end of an event.
|
||||
event_gap 60
|
||||
|
||||
# The number of pre-captured (buffered) pictures from before motion.
|
||||
pre_capture 80
|
||||
|
||||
# Number of frames to capture after motion is no longer detected.
|
||||
post_capture 300
|
||||
|
||||
############################################################
|
||||
# Script execution configuration parameters
|
||||
############################################################
|
||||
|
||||
# Command to be executed when an event starts.
|
||||
; on_event_start value
|
||||
|
||||
# Command to be executed when an event ends.
|
||||
; on_event_end value
|
||||
|
||||
# Command to be executed when a movie file is closed.
|
||||
; on_movie_end value
|
||||
|
||||
############################################################
|
||||
# Picture output configuration parameters
|
||||
############################################################
|
||||
|
||||
# Output pictures when motion is detected
|
||||
picture_output off
|
||||
|
||||
# File name(without extension) for pictures relative to target directory
|
||||
picture_filename %Y%m%d%H%M%S-%q
|
||||
|
||||
############################################################
|
||||
# Movie output configuration parameters
|
||||
############################################################
|
||||
|
||||
# Create movies of motion events.
|
||||
movie_output on
|
||||
|
||||
# Maximum length of movie in seconds.
|
||||
movie_max_time 30
|
||||
|
||||
# The encoding quality of the movie. (0=use bitrate. 1=worst quality, 100=best)
|
||||
movie_quality 45
|
||||
|
||||
# Container/Codec to used for the movie. See motion_guide.html
|
||||
movie_codec mp4
|
||||
|
||||
# File name(without extension) for movies relative to target directory
|
||||
movie_filename %Y%m%d-%H_%M_%S
|
||||
|
||||
############################################################
|
||||
# Webcontrol configuration parameters
|
||||
############################################################
|
||||
|
||||
# Port number used for the webcontrol.
|
||||
webcontrol_port 8080
|
||||
|
||||
# Restrict webcontrol connections to the localhost.
|
||||
webcontrol_localhost on
|
||||
|
||||
# Type of configuration options to allow via the webcontrol.
|
||||
webcontrol_parms 0
|
||||
|
||||
############################################################
|
||||
# Live stream configuration parameters
|
||||
############################################################
|
||||
|
||||
# The port number for the live stream.
|
||||
stream_port 8081
|
||||
|
||||
# Restrict stream connections to the localhost.
|
||||
stream_localhost on
|
||||
|
||||
##############################################################
|
||||
# Camera config files - One for each camera.
|
||||
##############################################################
|
||||
; camera /usr/etc/motion/camera1.conf
|
||||
; camera /usr/etc/motion/camera2.conf
|
||||
; camera /usr/etc/motion/camera3.conf
|
||||
; camera /usr/etc/motion/camera4.conf
|
||||
|
||||
##############################################################
|
||||
# Directory to read '.conf' files for cameras.
|
||||
##############################################################
|
||||
; camera_dir /usr/etc/motion/conf.d
|
||||
@@ -1,2 +0,0 @@
|
||||
[Service]
|
||||
User={{ nfs_user }}
|
||||
Reference in New Issue
Block a user