jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-17 10:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding ssl option to zoneminder (#4074)

Browse Source
This commit is contained in:
Richard Cox 2016-10-27 06:54:03 -07:00 committed by Fabian Affolter
parent b75c103db4
commit 91d682d02c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/zoneminder.py
View File

@ -14,7 +14,7 @@ import voluptuous as vol
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.const import ( from homeassistant.const import (
CONF_PATH, CONF_HOST, CONF_PASSWORD, CONF_USERNAME) CONF_PATH, CONF_HOST, CONF_SSL, CONF_PASSWORD, CONF_USERNAME)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -26,6 +26,7 @@ DOMAIN = 'zoneminder'
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({ DOMAIN: vol.Schema({
vol.Required(CONF_HOST): cv.string, vol.Required(CONF_HOST): cv.string,
vol.Optional(CONF_SSL, default=False): cv.boolean,
vol.Optional(CONF_PATH, default="/zm/"): cv.string, vol.Optional(CONF_PATH, default="/zm/"): cv.string,
vol.Optional(CONF_USERNAME): cv.string, vol.Optional(CONF_USERNAME): cv.string,
vol.Optional(CONF_PASSWORD): cv.string vol.Optional(CONF_PASSWORD): cv.string
@ -42,7 +43,12 @@ def setup(hass, config):
ZM = {} ZM = {}
conf = config[DOMAIN] conf = config[DOMAIN]
url = urljoin("http://" + conf[CONF_HOST], conf[CONF_PATH]) if conf[CONF_SSL]:
schema = "https"
else:
schema = "http"
url = urljoin(schema + "://" + conf[CONF_HOST], conf[CONF_PATH])
username = conf.get(CONF_USERNAME, None) username = conf.get(CONF_USERNAME, None)
password = conf.get(CONF_PASSWORD, None) password = conf.get(CONF_PASSWORD, None)