jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-25 18:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1247 from home-assistant/dev

Browse Source 
Release 181
This commit is contained in:
Pascal Vizeli 2019-08-18 21:07:21 +02:00 committed by GitHub
commit a513d5c09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hassio/const.py
View File

@ -3,7 +3,7 @@ from pathlib import Path
from ipaddress import ip_network from ipaddress import ip_network
HASSIO_VERSION = "180" HASSIO_VERSION = "181"
URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons" URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
URL_HASSIO_VERSION = "https://version.home-assistant.io/{channel}.json" URL_HASSIO_VERSION = "https://version.home-assistant.io/{channel}.json"

4
hassio/data/coredns.tmpl
View File

@ -1,8 +1,12 @@
.:53 { .:53 {
log log
errors
hosts /config/hosts { hosts /config/hosts {
fallthrough fallthrough
} }
template ANY AAAA local.hass.io hassio {
rcode NOERROR
}
forward . $servers { forward . $servers {
except local.hass.io except local.hass.io
policy sequential policy sequential

18
hassio/dns.py
View File

@ -120,8 +120,9 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
# Start is not Running # Start is not Running
if await self.instance.is_running(): if await self.instance.is_running():
return await self.restart()
await self.start() else:
await self.start()
async def unload(self) -> None: async def unload(self) -> None:
"""Unload DNS forwarder.""" """Unload DNS forwarder."""
@ -146,6 +147,8 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
self.version = self.instance.version self.version = self.instance.version
self.save_data() self.save_data()
# Init Hosts / Run server
self.write_hosts()
await self.start() await self.start()
async def update(self, version: Optional[str] = None) -> None: async def update(self, version: Optional[str] = None) -> None:
@ -174,14 +177,13 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
async def restart(self) -> None: async def restart(self) -> None:
"""Restart CoreDNS plugin.""" """Restart CoreDNS plugin."""
self._write_corefile()
with suppress(DockerAPIError): with suppress(DockerAPIError):
await self.instance.stop() await self.instance.restart()
await self.start()
async def start(self) -> None: async def start(self) -> None:
"""Run CoreDNS.""" """Run CoreDNS."""
self._write_corefile() self._write_corefile()
self.write_hosts()
# Start Instance # Start Instance
_LOGGER.info("Start CoreDNS plugin") _LOGGER.info("Start CoreDNS plugin")
@ -195,6 +197,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
"""Reset Config / Hosts.""" """Reset Config / Hosts."""
self.servers = DNS_SERVERS self.servers = DNS_SERVERS
# Resets hosts
with suppress(OSError): with suppress(OSError):
self.hosts.unlink() self.hosts.unlink()
self._init_hosts() self._init_hosts()
@ -231,6 +234,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
["homeassistant", "home-assistant"], ["homeassistant", "home-assistant"],
write=False, write=False,
) )
self.add_host(self.sys_docker.network.dns, ["dns"], write=False)
def write_hosts(self) -> None: def write_hosts(self) -> None:
"""Write hosts from memory to file.""" """Write hosts from memory to file."""
@ -343,7 +347,7 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
continue continue
resolv_lines.append(line.strip()) resolv_lines.append(line.strip())
except OSError as err: except OSError as err:
_LOGGER.error("Can't read local resolv: %s", err) _LOGGER.warning("Can't read local resolv: %s", err)
raise CoreDNSError() from None raise CoreDNSError() from None
if nameserver in resolv_lines: if nameserver in resolv_lines:
@ -357,5 +361,5 @@ class CoreDNS(JsonConfig, CoreSysAttributes):
for line in resolv_lines: for line in resolv_lines:
resolv.write(f"{line}\n") resolv.write(f"{line}\n")
except OSError as err: except OSError as err:
_LOGGER.error("Can't write local resolv: %s", err) _LOGGER.warning("Can't write local resolv: %s", err)
raise CoreDNSError() from None raise CoreDNSError() from None