Skip to content
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

Zoneminder SSL fix #16157

Merged
merged 5 commits into from
Aug 25, 2018
Merged

Zoneminder SSL fix #16157

merged 5 commits into from
Aug 25, 2018

Conversation

djm300
Copy link
Contributor

@djm300 djm300 commented Aug 23, 2018

Description:

Added option to disable ssl verification checks for the zoneminder module

This is a re-try of #14869 which erroneously contained other commits due to my complete lack of git skills (apologies for that).

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

Example entry for configuration.yaml (if applicable):

zoneminder:
  host: 192.168.1.1:1080
  ssl: True
  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

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.

Added a verify_ssl parameter for zoneminder
@homeassistant
Copy link
Contributor

Hi @djm300,

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

_LOGGER.exception('JSON decode exception caught while attempting to '
'decode "%s"', req.text)
_LOGGER.exception(
"JSON decode exception caught while attempting to decode: %s",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trailing whitespace

Copy link
Member

@fabaff fabaff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 🐦

@fabaff fabaff merged commit f929c38 into home-assistant:dev Aug 25, 2018
@ghost ghost removed the in progress label Aug 25, 2018
@balloob balloob mentioned this pull request Sep 17, 2018
@home-assistant home-assistant locked and limited conversation to collaborators Dec 10, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants