updates

RXWatcher · Jul 1, 2020 · 9ff551c · 9ff551c
1 parent 3e98449
commit 9ff551c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 39 deletions.
diff --git a/.env.example b/.env.example
diff --git a/LICENSE b/LICENSE
diff --git a/authelia/users_database.yml.example b/authelia/users_database.yml.example
@@ -9,13 +9,15 @@
 # List of users
 users:
   USERNAME:
+    displayname: "John Doe"
     password: "HASHED_PASSWORD"
     email: USER_EMAIL
     groups:
       - admins
       - dev
 # EXAMPLE USER
 #  john:
+#    displayname: "John Doe"
 #    password: "$argon2id$v=19$m=1048576,p=john_strong_hashed_password"
 #    email: [email protected]
 #    groups:

diff --git a/docker-compose-t2-obsolete.yml b/docker-compose-t2-obsolete.yml
@@ -253,3 +253,41 @@ services:
       - PUID=$PUID
       - PGID=$PGID
       - TZ=$TZ
+
+  # Home Assistant Core - Home Automation
+  # Added temporarily since HASS.io (Home Assistant Supervised) on Docker has been deprecated.
+  homeassistant:
+    container_name: hass-core
+    restart: unless-stopped
+    image: homeassistant/home-assistant:0.111.0
+    networks:
+      - t2_proxy
+    devices:
+      - /dev/ttyUSB0:/dev/ttyUSB0
+      - /dev/ttyUSB1:/dev/ttyUSB1
+      - /dev/ttyACM0:/dev/ttyACM0
+    ports:
+      - target: 8123
+        published: $HOMEASSISTANT_PORT
+        protocol: tcp
+        mode: host
+    privileged: true
+    volumes:
+      - ${USERDIR}/docker/hassio/homeassistant:/config
+      - /etc/localtime:/etc/localtime:ro
+      - ${USERDIR}/docker/shared:/shared
+      - ${USERDIR}/docker/open-zwave:/open-zwave
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    labels:
+      - "traefik.enable=true"
+      ## HTTP Routers
+      - "traefik.http.routers.homeassistant-rtr.entrypoints=https"
+      - "traefik.http.routers.homeassistant-rtr.rule=Host(`hassio.$DOMAINNAME`)"
+      ## Middlewares
+      - "traefik.http.routers.homeassistant-rtr.middlewares=chain-no-auth@file"
+      ## HTTP Services
+      - "traefik.http.routers.homeassistant-rtr.service=homeassistant-svc"
+      - "traefik.http.services.homeassistant-svc.loadbalancer.server.port=8123"
diff --git a/docker-compose-t2.yml b/docker-compose-t2.yml
@@ -157,7 +157,7 @@ services:
     container_name: authelia
     # Check this before upgrading: https://github.com/authelia/authelia/blob/master/BREAKING.md
     # image: authelia/authelia:latest
-    image: authelia/authelia:4.20
+    image: authelia/authelia:4.21.0
     restart: always
     networks:
       - t2_proxy
@@ -296,44 +296,6 @@ services:
 
   ############################# SMART HOME
 
-  # Home Assistant Core - Home Automation
-  # Added temporarily since HASS.io (Home Assistant Supervised) on Docker has been deprecated.
-  homeassistant:
-    container_name: hass-core
-    restart: unless-stopped
-    image: homeassistant/home-assistant:0.111.0
-    networks:
-      - t2_proxy
-    devices:
-      - /dev/ttyUSB0:/dev/ttyUSB0
-      - /dev/ttyUSB1:/dev/ttyUSB1
-      - /dev/ttyACM0:/dev/ttyACM0
-    ports:
-      - target: 8123
-        published: $HOMEASSISTANT_PORT
-        protocol: tcp
-        mode: host
-    privileged: true
-    volumes:
-      - ${USERDIR}/docker/hassio/homeassistant:/config
-      - /etc/localtime:/etc/localtime:ro
-      - ${USERDIR}/docker/shared:/shared
-      - ${USERDIR}/docker/open-zwave:/open-zwave
-    environment:
-      - PUID=${PUID}
-      - PGID=${PGID}
-      - TZ=${TZ}
-    labels:
-      - "traefik.enable=true"
-      ## HTTP Routers
-      - "traefik.http.routers.homeassistant-rtr.entrypoints=https"
-      - "traefik.http.routers.homeassistant-rtr.rule=Host(`hassio.$DOMAINNAME`)"
-      ## Middlewares
-      - "traefik.http.routers.homeassistant-rtr.middlewares=chain-no-auth@file"
-      ## HTTP Services
-      - "traefik.http.routers.homeassistant-rtr.service=homeassistant-svc"
-      - "traefik.http.services.homeassistant-svc.loadbalancer.server.port=8123"
-
   # HA-Dockermon - Manage Docker containers in Home Assistant
   ha-dockermon:
     image: philhawthorne/ha-dockermon:latest
@@ -1846,3 +1808,4 @@ services:
       - "traefik.http.routers.cf-companion-rtr.rule=Host(`shell.$DOMAINNAME`)"
       - "traefik.http.routers.cf-companion-rtr.rule=Host(`syno.$DOMAINNAME`)"
       - "traefik.http.routers.cf-companion-rtr.rule=Host(`ufi.$DOMAINNAME`)"
+      - "traefik.http.routers.cf-companion-rtr.rule=Host(`webmin.$DOMAINNAME`)"