diff --git a/Jenkinsfile b/Jenkinsfile index 0592a00..d7afef7 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}\" 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, extras: "--extra-vars 'ipgeolocation_api_key=\"${frigate_config.ipgeolocation.api_key}\" wyze_email=\"${frigate_config.wyze.email}\" wyze_password=\"${frigate_config.wyze.password}\" wyze_api_id=\"${frigate_config.wyze.api_id}\" wyze_api_key=\"${frigate_config.wyze.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, playbook: 'stop.yaml' ansiblePlaybook credentialsId: 'rivendell-ssh-key', disableHostKeyChecking: true, playbook: 'start.yaml' } diff --git a/conf/docker-compose.yaml b/conf/docker-compose.yaml index 654457a..38496f8 100644 --- a/conf/docker-compose.yaml +++ b/conf/docker-compose.yaml @@ -53,13 +53,16 @@ services: - 127.0.0.1:10000:5000 wyze-bridge: container_name: frigate-wyze-bridge - image: mrlt8/wyze-bridge:2.4.0 + image: mrlt8/wyze-bridge:2.9.7 restart: unless-stopped environment: NET_MODE: LAN FILTER_NAMES: Back Yard Cam + WB_AUTH: 'false' WYZE_EMAIL: ${WYZE_EMAIL} WYZE_PASSWORD: ${WYZE_PASSWORD} + API_ID: ${WYZE_API_ID} + API_KEY: ${WYZE_API_KEY} volumes: - type: bind source: /etc/localtime diff --git a/install.yaml b/install.yaml index 94f5baf..e24d80f 100644 --- a/install.yaml +++ b/install.yaml @@ -7,6 +7,10 @@ prompt: Enter email for Wyze account - name: wyze_password prompt: Enter password for Wyze account + - name: wyze_api_id + prompt: Enter API ID for Wyze account + - name: wyze_api_key + prompt: Enter API key for Wyze account - name: garage_rtsp_password prompt: Enter password for garage camera RTSP stream user motion - name: front_door_rtsp_password @@ -148,6 +152,8 @@ wyze: email: '{{wyze_email}}' password: '{{wyze_password}}' + api_id: '{{wyze_api_id}}' + api_key: '{{wyze_api_key}}' rtsp: garage: password: '{{garage_rtsp_password}}' diff --git a/start.yaml b/start.yaml index 0134ea8..5213e38 100644 --- a/start.yaml +++ b/start.yaml @@ -38,6 +38,8 @@ IPGEOLOCATION_API_KEY: '{{frigate_config.ipgeolocation.api_key}}' WYZE_EMAIL: '{{frigate_config.wyze.email}}' WYZE_PASSWORD: '{{frigate_config.wyze.password}}' + WYZE_API_ID: '{{frigate_config.wyze.api_id}}' + WYZE_API_KEY: '{{frigate_config.wyze.api_key}}' 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}}'