From 5799d1aec9a80c0f650b7e9ec7556b59d9ab8446 Mon Sep 17 00:00:00 2001
From: Richard Cox <code@bot37.com>
Date: Tue, 18 Oct 2016 18:25:47 -0700
Subject: [PATCH] Fixing verbage (#3940)
---
homeassistant/components/zoneminder.py | 6 +++---
homeassistant/const.py | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/homeassistant/components/zoneminder.py b/homeassistant/components/zoneminder.py
index 3f43ae01904..0ed985fb427 100644
--- a/homeassistant/components/zoneminder.py
+++ b/homeassistant/components/zoneminder.py
@@ -14,7 +14,7 @@ import voluptuous as vol
import homeassistant.helpers.config_validation as cv
from homeassistant.const import (
- CONF_URL, CONF_HOST, CONF_PASSWORD, CONF_USERNAME)
+ CONF_PATH, CONF_HOST, CONF_PASSWORD, CONF_USERNAME)
_LOGGER = logging.getLogger(__name__)
@@ -26,7 +26,7 @@ DOMAIN = 'zoneminder'
CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({
vol.Required(CONF_HOST): cv.string,
- vol.Optional(CONF_URL, default="/zm/"): cv.string,
+ vol.Optional(CONF_PATH, default="/zm/"): cv.string,
vol.Optional(CONF_USERNAME): cv.string,
vol.Optional(CONF_PASSWORD): cv.string
})
@@ -42,7 +42,7 @@ def setup(hass, config):
ZM = {}
conf = config[DOMAIN]
- url = urljoin("http://" + conf[CONF_HOST], conf[CONF_URL])
+ url = urljoin("http://" + conf[CONF_HOST], conf[CONF_PATH])
username = conf.get(CONF_USERNAME, None)
password = conf.get(CONF_PASSWORD, None)
diff --git a/homeassistant/const.py b/homeassistant/const.py
index e2670d2b08f..763d3639b68 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -104,6 +104,7 @@ CONF_NAME = 'name'
CONF_OFFSET = 'offset'
CONF_OPTIMISTIC = 'optimistic'
CONF_PASSWORD = 'password'
+CONF_PATH = 'path'
CONF_PAYLOAD = 'payload'
CONF_PAYLOAD_OFF = 'payload_off'
CONF_PAYLOAD_ON = 'payload_on'
--
GitLab