diff --git a/Jenkinsfile b/Jenkinsfile index 72de72f..838965f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { frigate_config = readJSON file: 'frigate_config.json' } - ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, extras: "--extra-vars 'ipgeolocation_api_key=\"${frigate_config.ipgeolocation.api_key}\" garage_rtsp_password=\"${frigate_config.rtsp.garage.password}\" front_door_rtsp_password=\"${frigate_config.rtsp.front_door.password}\" doorbell_rtsp_password=\"${frigate_config.rtsp.doorbell.password}\" driveway_rtsp_password=\"${frigate_config.rtsp.driveway.password}\" back_door_rtsp_password=\"${frigate_config.rtsp.back_door.password}\" family_room_rtsp_password=\"${frigate_config.rtsp.family_room.password}\"'", playbook: 'install.yaml' + ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, extras: "--extra-vars 'ipgeolocation_api_key=\"${frigate_config.ipgeolocation.api_key}\" wyze_email=\"${frigate_config.wyze.email}\" wyze_password=\"${frigate_config.wyze.password}\" garage_rtsp_password=\"${frigate_config.rtsp.garage.password}\" front_door_rtsp_password=\"${frigate_config.rtsp.front_door.password}\" doorbell_rtsp_password=\"${frigate_config.rtsp.doorbell.password}\" driveway_rtsp_password=\"${frigate_config.rtsp.driveway.password}\" back_door_rtsp_password=\"${frigate_config.rtsp.back_door.password}\" family_room_rtsp_password=\"${frigate_config.rtsp.family_room.password}\"'", playbook: 'install.yaml' ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, playbook: 'stop.yaml' ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, playbook: 'start.yaml' } diff --git a/conf/config.yaml b/conf/config.yaml index 5f75024..1a13df4 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -97,7 +97,7 @@ cameras: enabled: true ffmpeg: inputs: - - path: 'rtsp://{FRIGATE_BACK_DOOR_RTSP_USERNAME}:{FRIGATE_BACK_DOOR_RTSP_PASSWORD}@192.168.0.202:554/live' + - path: 'rtsp://wyze-bridge:8554/back-yard-cam' roles: - detect - record diff --git a/conf/docker-compose.yaml b/conf/docker-compose.yaml index d1c1c7e..6653281 100644 --- a/conf/docker-compose.yaml +++ b/conf/docker-compose.yaml @@ -9,6 +9,7 @@ services: restart: unless-stopped depends_on: - mqtt + - wyze-bridge healthcheck: test: ls /media/frigate && curl -s -f http://localhost:5000 -o /dev/null interval: 60s @@ -50,6 +51,22 @@ services: - frigate ports: - 127.0.0.1:10000:5000 + wyze-bridge: + container_name: frigate-wyze-bridge + image: mrlt8/wyze-bridge:2.4.0 + restart: unless-stopped + environment: + NET_MODE: LAN + FILTER_NAMES: Back Yard Cam + WYZE_EMAIL: ${WYZE_EMAIL} + WYZE_PASSWORD: ${WYZE_PASSWORD} + volumes: + - type: bind + source: /etc/localtime + target: /etc/localtime + read_only: true + networks: + - frigate notify: container_name: frigate-notify image: frigate-notify:latest diff --git a/install.yaml b/install.yaml index fe56313..bb287e2 100644 --- a/install.yaml +++ b/install.yaml @@ -3,6 +3,10 @@ vars_prompt: - name: ipgeolocation_api_key prompt: Enter API key for IPGeolocation + - name: wyze_email + prompt: Enter email for Wyze account + - name: wyze_password + prompt: Enter password for Wyze account - name: garage_rtsp_password prompt: Enter password for garage camera RTSP stream user motion - name: front_door_rtsp_password @@ -118,6 +122,9 @@ frigate_config: ipgeolocation: api_key: '{{ipgeolocation_api_key}}' + wyze: + email: '{{wyze_email}}' + password: '{{wyze_password}}' rtsp: garage: password: '{{garage_rtsp_password}}' diff --git a/start.yaml b/start.yaml index 6bdb429..0134ea8 100644 --- a/start.yaml +++ b/start.yaml @@ -36,6 +36,8 @@ - name: Docker Compose up Frigate environment: IPGEOLOCATION_API_KEY: '{{frigate_config.ipgeolocation.api_key}}' + WYZE_EMAIL: '{{frigate_config.wyze.email}}' + WYZE_PASSWORD: '{{frigate_config.wyze.password}}' FRIGATE_GARAGE_RTSP_PASSWORD: '{{frigate_config.rtsp.garage.password}}' FRIGATE_FRONT_DOOR_RTSP_PASSWORD: '{{frigate_config.rtsp.front_door.password}}' FRIGATE_DOORBELL_RTSP_PASSWORD: '{{frigate_config.rtsp.doorbell.password}}'