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

simplify env

Browse Source
This commit is contained in:
pvizeli 2017-03-30 17:51:38 +02:00
parent 5eab77c199
commit 7437480379
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hassio_api/hassio/config.py
View File

@ -5,8 +5,7 @@ import os
from .const import ( from .const import (
FILE_HASSIO_CONFIG, HOMEASSISTANT_TAG, HOMEASSISTANT_IMAGE, FILE_HASSIO_CONFIG, HOMEASSISTANT_TAG, HOMEASSISTANT_IMAGE,
HOMEASSISTANT_SSL, HOMEASSISTANT_CONFIG, HASSIO_SHARE_EXT, HOMEASSISTANT_SSL, HOMEASSISTANT_CONFIG, HASSIO_SHARE)
HASSIO_SHARE_INT)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -60,19 +59,19 @@ class CoreConfig(object):
@property @property
def path_config_docker(self): def path_config_docker(self):
"""Return config path extern for docker.""" """Return config path extern for docker."""
return HOMEASSISTANT_CONFIG.format(HASSIO_SHARE_EXT) return HOMEASSISTANT_CONFIG.format(os.environ['SUPERVISOR_NAME'])
@property @property
def path_config(self): def path_config(self):
"""Return config path inside supervisor.""" """Return config path inside supervisor."""
return HOMEASSISTANT_CONFIG.format(HASSIO_SHARE_INT) return HOMEASSISTANT_CONFIG.format(HASSIO_SHARE)
@property @property
def path_ssl_docker(self): def path_ssl_docker(self):
"""Return SSL path extern for docker.""" """Return SSL path extern for docker."""
return HOMEASSISTANT_SSL.format(HASSIO_SHARE_EXT) return HOMEASSISTANT_SSL.format(os.environ['SUPERVISOR_NAME'])
@property @property
def path_ssl(self): def path_ssl(self):
"""Return SSL path inside supervisor.""" """Return SSL path inside supervisor."""
return HOMEASSISTANT_SSL.format(HASSIO_SHARE_INT) return HOMEASSISTANT_SSL.format(HASSIO_SHARE)

6
hassio_api/hassio/const.py
View File

@ -1,6 +1,4 @@
"""Const file for HassIO.""" """Const file for HassIO."""
import os
HASSIO_VERSION = '0.3' HASSIO_VERSION = '0.3'
URL_HASSIO_VERSION = \ URL_HASSIO_VERSION = \
@ -13,9 +11,7 @@ FILE_HOST_NETWORK = '/boot/network'
FILE_HASSIO_ADDONS = '/data/addons.json' FILE_HASSIO_ADDONS = '/data/addons.json'
FILE_HASSIO_CONFIG = '/data/config.json' FILE_HASSIO_CONFIG = '/data/config.json'
HASSIO_SHARE_EXT = os.environ['SUPERVISOR_SHARE'] HASSIO_SHARE = '/data'
HASSIO_SHARE_INT = '/data'
HASSIO_DOCKER = os.environ['SUPERVISOR_NAME']
SOCKET_DOCKER = "/var/run/docker.sock" SOCKET_DOCKER = "/var/run/docker.sock"
SOCKET_HC = "/var/run/hassio-hc.sock" SOCKET_HC = "/var/run/hassio-hc.sock"

5
hassio_api/hassio/dock/supervisor.py
View File

@ -1,6 +1,7 @@
"""Init file for HassIO docker object.""" """Init file for HassIO docker object."""
import os
from . import DockerBase from . import DockerBase
from ..const import HASSIO_DOCKER
class DockerSupervisor(DockerBase): class DockerSupervisor(DockerBase):
@ -9,7 +10,7 @@ class DockerSupervisor(DockerBase):
@property @property
def docker_name(self): def docker_name(self):
"""Return name of docker container.""" """Return name of docker container."""
return HASSIO_DOCKER return os.environ['SUPERVISOR_NAME']
async def run(self): async def run(self):
"""Run docker image.""" """Run docker image."""