From cd319daab4850f6640c095e2cf0d37da11e91dc7 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sun, 12 Jan 2020 17:59:27 +0100
Subject: [PATCH] Added homeassistant & fixes

---
 homeassistant/docker-compose.yaml             | 34 +++++++++++++++++++
 portainer/docker-compose.yaml                 |  2 +-
 ...docker-compose.yml => docker-compose.yaml} | 14 ++++----
 ...docker-compose.yml => docker-compose.yaml} |  2 +-
 4 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 homeassistant/docker-compose.yaml
 rename traefik/{docker-compose.yml => docker-compose.yaml} (87%)
 rename xen-orchestra-ce/{docker-compose.yml => docker-compose.yaml} (96%)

diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
new file mode 100644
index 0000000..baa9ca4
--- /dev/null
+++ b/homeassistant/docker-compose.yaml
@@ -0,0 +1,34 @@
+version: '3'
+
+services:
+  homeassistant:
+    container_name: homeassistant
+    image: homeassistant/home-assistant:stable
+    #command: --log-file /config/log/home-assistant.log
+    restart: always
+    #ports:
+    #  - 8123:8123
+    environment:
+      - TZ=${DOCKER_TZ}
+    privileged: true
+    volumes:
+      - ${DOCKER_CFG_DIR}/homeassistant:/config
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.homeassistant.entrypoints=http"
+      - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)"
+      #- "traefik.http.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https"
+      #- "traefik.http.routers.homeassistant.middlewares=homeassistant-https-redirect"
+      - "traefik.http.routers.homeassistant-secure.entrypoints=https"
+      - "traefik.http.routers.homeassistant-secure.rule=Host(`home.giorgioravera.it`)"
+      - "traefik.http.routers.homeassistant-secure.tls=true"
+      #- "traefik.http.routers.homeassistant-secure.tls.certresolver=http"
+      - "traefik.http.routers.homeassistant-secure.service=homeassistant"
+      - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
+      - "traefik.docker.network=proxy"
+
+networks:
+  proxy:
+    external: true
diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index 3fd399e..e2a01e5 100644
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     #  - 9000:9000
     #  - 8000:8000
     environment:
-      - TZ=${DOCKER_TZ} 
+      - TZ=${DOCKER_TZ}
     volumes:
       - ${DOCKER_CFG_DIR}/portainer:/data
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yaml
similarity index 87%
rename from traefik/docker-compose.yml
rename to traefik/docker-compose.yaml
index d0dd4e0..0e080ee 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yaml
@@ -4,10 +4,6 @@ services:
   traefik:
     container_name: traefik
     image: traefik:v2.0
-    restart: unless-stopped
-    ports:
-      - 80:80
-      - 443:443
 #    command:
 #      - --api
 #      - --api.dashboard
@@ -16,6 +12,11 @@ services:
 #      - --providers.docker=true
 #      - --providers.file.watch=true
 #      - --log.level=DEBUG
+    #restart: unless-stopped
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
     environment:
       - TZ=${DOCKER_TZ}
     volumes:
@@ -23,9 +24,8 @@ services:
       - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
       - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
       - ${DOCKER_CFG_DIR}/traefik/config:/config
-      - ${DOCKER_CFG_DIR}/traefik:/certs
-      #- /etc/letsencrypt/live/server.giorgioravera.it/fullchain.pem/:/certs/fullchain.pem
-      #- /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem/:/certs/privkey.pem
+      - /etc/letsencrypt/live/server.giorgioravera.it/fullchain.pem:/certs/fullchain.pem
+      - /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem:/certs/privkey.pem
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - proxy
diff --git a/xen-orchestra-ce/docker-compose.yml b/xen-orchestra-ce/docker-compose.yaml
similarity index 96%
rename from xen-orchestra-ce/docker-compose.yml
rename to xen-orchestra-ce/docker-compose.yaml
index 06795d2..8d35efa 100644
--- a/xen-orchestra-ce/docker-compose.yml
+++ b/xen-orchestra-ce/docker-compose.yaml
@@ -34,7 +34,7 @@ services:
       - "traefik.http.routers.xoa.entrypoints=http"
       - "traefik.http.routers.xoa.rule=Host(`xoa.giorgioravera.it`)"
       #- "traefik.http.middlewares.xoa-https-redirect.redirectscheme.scheme=https"
-      #- "traefik.http.routers.xoa.middlewares=portainer-https-redirect"
+      #- "traefik.http.routers.xoa.middlewares=xoa-https-redirect"
       - "traefik.http.routers.xoa-secure.entrypoints=https"
       - "traefik.http.routers.xoa-secure.rule=Host(`xoa.giorgioravera.it`)"
       - "traefik.http.routers.xoa-secure.tls=true"
-- 
2.47.3