New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optionally disable ssl verification for mjpeg camera #19277

Merged
merged 2 commits into from Dec 18, 2018

Conversation

Projects
None yet
3 participants
@rohankapoorcom
Copy link
Member

rohankapoorcom commented Dec 14, 2018

Description:

Add a configuration option to mjpeg camera to allow disabling ssl certification verification. This is also needed for ZoneMinder cameras (which already provide that option and use it for sensors and switches).

Related issue (if applicable): fixes #18418

Pull request in home-assistant.io with documentation (if applicable): home-assistant/home-assistant.io#7837

Example entry for configuration.yaml (if applicable):

camera:
  - platform: mjpeg
    mjpeg_url: http://192.168.1.92/mjpeg
    verify_ssl: false

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • New dependencies have been added to the REQUIREMENTS variable (example).
  • New dependencies are only imported inside functions that use them (example).
  • New or updated dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
  • New files were added to .coveragerc.

If the code does not interact with devices:

  • Tests have been added to verify that the new code works.
@balloob

This comment has been minimized.

Copy link
Member

balloob commented Dec 14, 2018

Ok to merge when build passes and merge conflicts resolved.

@rohankapoorcom

This comment has been minimized.

Copy link
Member

rohankapoorcom commented Dec 16, 2018

Conflicts resolved, should be ready for merge.

@balloob balloob merged commit 6c64b31 into home-assistant:dev Dec 18, 2018

5 checks passed

Hound No violations found. Woof!
WIP Legacy commit status override — see details
Details
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.002%) to 92.887%
Details

@wafflebot wafflebot bot removed the in progress label Dec 18, 2018

dshokouhi added a commit to dshokouhi/home-assistant that referenced this pull request Dec 25, 2018

@balloob balloob referenced this pull request Jan 10, 2019

Merged

0.85.0 #19897

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment