From c051e0ece07cf3c9de51d5de799adac27aad2960 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Mon, 21 May 2018 15:21:22 +0200
Subject: [PATCH] Centralised default parameter for domain.

---
 esphomeyaml/__main__.py        | 6 +++---
 esphomeyaml/components/wifi.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py
index 9934522b6a..4482fdf4ca 100644
--- a/esphomeyaml/__main__.py
+++ b/esphomeyaml/__main__.py
@@ -163,13 +163,13 @@ def upload_program(config, args, port):
         _LOGGER.error("No serial port found and OTA not enabled. Can't upload!")
         return -1
 
-    DOMAIN = '.' + config[CONF_WIFI].get(CONF_DOMAIN, 'local')
+    domain = '.' + config[CONF_WIFI][CONF_DOMAIN]
     if CONF_MANUAL_IP in config[CONF_WIFI]:
         host = str(config[CONF_WIFI][CONF_MANUAL_IP][CONF_STATIC_IP])
     elif CONF_HOSTNAME in config[CONF_WIFI]:
-        host = config[CONF_WIFI][CONF_HOSTNAME] + DOMAIN
+        host = config[CONF_WIFI][CONF_HOSTNAME] + domain
     else:
-        host = config[CONF_ESPHOMEYAML][CONF_NAME] + DOMAIN
+        host = config[CONF_ESPHOMEYAML][CONF_NAME] + domain
 
     from esphomeyaml.components import ota
     from esphomeyaml import espota
diff --git a/esphomeyaml/components/wifi.py b/esphomeyaml/components/wifi.py
index 5b74430846..8d512ed8e6 100644
--- a/esphomeyaml/components/wifi.py
+++ b/esphomeyaml/components/wifi.py
@@ -42,7 +42,7 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_MANUAL_IP): AP_MANUAL_IP_SCHEMA,
     }),
     vol.Optional(CONF_HOSTNAME): cv.hostname,
-    vol.Optional(CONF_DOMAIN): cv.string,
+    vol.Required(CONF_DOMAIN, default='local'): cv.string,
 })
 
 # pylint: disable=invalid-name