From 297f4af0473fb45fee126df6a0b2f91f0103730e Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sun, 23 Apr 2017 15:45:03 +0200
Subject: [PATCH] Cleanup old stuff / make more secure (#10)

* Cleanup old stuff / make more secure

* pump version
---
 README.md                 | 6 ++++++
 hassio/addons/data.py     | 6 +-----
 hassio/addons/validate.py | 3 +--
 hassio/config.py          | 2 +-
 hassio/const.py           | 3 +--
 hassio/dock/addon.py      | 5 -----
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 8f02c2971..9e5204783 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,12 @@ It is a docker image (supervisor) they manage HomeAssistant docker and give a in
 
 [HassIO-Addons](https://github.com/pvizeli/hassio-addons) | [HassIO-Build](https://github.com/pvizeli/hassio-build)
 
+## Feature in progress
+- Backup/Restore
+- Read docker logs and extend to api
+- MQTT addon
+- DHCP-Server addon
+
 # HomeAssistant
 
 ## SSL
diff --git a/hassio/addons/data.py b/hassio/addons/data.py
index acb00930a..d7de29d72 100644
--- a/hassio/addons/data.py
+++ b/hassio/addons/data.py
@@ -10,7 +10,7 @@ from ..const import (
     FILE_HASSIO_ADDONS, ATTR_NAME, ATTR_VERSION, ATTR_SLUG, ATTR_DESCRIPTON,
     ATTR_STARTUP, ATTR_BOOT, ATTR_MAP_SSL, ATTR_MAP_CONFIG, ATTR_OPTIONS,
     ATTR_PORTS, BOOT_AUTO, DOCKER_REPO, ATTR_INSTALLED, ATTR_SCHEMA,
-    ATTR_IMAGE, ATTR_MAP_HASSIO)
+    ATTR_IMAGE)
 from ..config import Config
 from ..tools import read_json_file, write_json_file
 
@@ -190,10 +190,6 @@ class AddonsData(Config):
         """Return True if ssl map is needed."""
         return self._addons_data[addon][ATTR_MAP_SSL]
 
-    def need_hassio(self, addon):
-        """Return True if hassio map is needed."""
-        return self._addons_data[addon][ATTR_MAP_HASSIO]
-
     def path_data(self, addon):
         """Return addon data path inside supervisor."""
         return "{}/{}".format(
diff --git a/hassio/addons/validate.py b/hassio/addons/validate.py
index 2bd46f8de..c6950e734 100644
--- a/hassio/addons/validate.py
+++ b/hassio/addons/validate.py
@@ -5,7 +5,7 @@ from ..const import (
     ATTR_NAME, ATTR_VERSION, ATTR_SLUG, ATTR_DESCRIPTON, ATTR_STARTUP,
     ATTR_BOOT, ATTR_MAP_SSL, ATTR_MAP_CONFIG, ATTR_OPTIONS,
     ATTR_PORTS, STARTUP_ONCE, STARTUP_AFTER, STARTUP_BEFORE, BOOT_AUTO,
-    BOOT_MANUAL, ATTR_SCHEMA, ATTR_IMAGE, ATTR_MAP_HASSIO)
+    BOOT_MANUAL, ATTR_SCHEMA, ATTR_IMAGE)
 
 V_STR = 'str'
 V_INT = 'int'
@@ -29,7 +29,6 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
     vol.Optional(ATTR_PORTS): dict,
     vol.Optional(ATTR_MAP_CONFIG, default=False): vol.Boolean(),
     vol.Optional(ATTR_MAP_SSL, default=False): vol.Boolean(),
-    vol.Optional(ATTR_MAP_HASSIO, default=False): vol.Boolean(),
     vol.Required(ATTR_OPTIONS): dict,
     vol.Required(ATTR_SCHEMA): {
         vol.Coerce(str): vol.Any(ADDON_ELEMENT, [
diff --git a/hassio/config.py b/hassio/config.py
index f9fdeff01..dacdf6440 100644
--- a/hassio/config.py
+++ b/hassio/config.py
@@ -8,7 +8,7 @@ from .tools import (
 
 _LOGGER = logging.getLogger(__name__)
 
-HOMEASSISTANT_CONFIG = "{}/homeassistant_config"
+HOMEASSISTANT_CONFIG = "{}/homeassistant"
 HOMEASSISTANT_IMAGE = 'homeassistant_image'
 HOMEASSISTANT_CURRENT = 'homeassistant_current'
 
diff --git a/hassio/const.py b/hassio/const.py
index d4905ceb6..2c6322703 100644
--- a/hassio/const.py
+++ b/hassio/const.py
@@ -1,5 +1,5 @@
 """Const file for HassIO."""
-HASSIO_VERSION = '0.10'
+HASSIO_VERSION = '0.11'
 
 URL_HASSIO_VERSION = \
     'https://raw.githubusercontent.com/pvizeli/hassio/master/version.json'
@@ -43,7 +43,6 @@ ATTR_BOOT = 'boot'
 ATTR_PORTS = 'ports'
 ATTR_MAP_CONFIG = 'map_config'
 ATTR_MAP_SSL = 'map_ssl'
-ATTR_MAP_HASSIO = 'map_hassio'
 ATTR_OPTIONS = 'options'
 ATTR_INSTALLED = 'installed'
 ATTR_STATE = 'state'
diff --git a/hassio/dock/addon.py b/hassio/dock/addon.py
index 1c7b49e74..408908ce0 100644
--- a/hassio/dock/addon.py
+++ b/hassio/dock/addon.py
@@ -52,11 +52,6 @@ class DockerAddon(DockerBase):
                 self.config.path_ssl_docker: {
                     'bind': '/ssl', 'mode': 'rw'
                 }})
-        if self.addons_data.need_hassio(self.addon):
-            volumes.update({
-                self.config.path_hassio_docker: {
-                    'bind': '/hassio', 'mode': 'rw'
-                }})
 
         try:
             self.container = self.dock.containers.run(