Moved homeassistant to net, cleaned not used entry

diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
index 128fd458bf7af8033a780746ce4c42fa3b638a3d..40d5868087077c5c93c002574dfd7ea3108cb403 120000 (symlink)
--- a/homeassistant/docker-compose.yaml
+++ b/homeassistant/docker-compose.yaml
@@ -1 +1 @@
-docker-compose.yaml.net
\ No newline at end of file
+docker-compose.yaml.host
\ No newline at end of file

diff --git a/homeassistant/docker-compose.yaml.host b/homeassistant/docker-compose.yaml.host
index 7ea29d84f5cdb7e26ace301ac7cd3f50f5f458cc..aee422195785716dda5a27370f22d18023a0b701 100644 (file)
--- a/homeassistant/docker-compose.yaml.host
+++ b/homeassistant/docker-compose.yaml.host
@@ -6,8 +6,8 @@ services:
     image: homeassistant/home-assistant:stable
     #command: --log-file /config/log/home-assistant.log
     restart: always
-    ports:
-      - 8123:8123
+    #ports:
+    #  - 8123:8123
     depends_on:
       - zigbee2mqtt
       - mosquitto
@@ -22,15 +22,15 @@ services:
       - "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.service=homeassistant"
+      - "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=host"
 
   zigbee2mqtt:
     container_name: zigbee2mqtt
@@ -72,4 +72,3 @@ services:
     network_mode: host
     labels:
     - traefik.enable=false
-

diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
deleted file mode 100644 (file)
index 4de9082ce39678078905146d6ca3570ca10dfd91..0000000000000000000000000000000000000000
--- a/portainer/docker-compose.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '3'
-
-services:
-  portainer:
-    container_name: portainer
-    image: portainer/portainer
-    command: -H unix:///var/run/docker.sock
-    restart: always
-    #ports:
-    #  - 9000:9000
-    environment:
-      - TZ=${DOCKER_TZ}
-    volumes:
-      - ${DOCKER_CFG_DIR}/portainer:/data
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.portainer.entrypoints=http"
-      - "traefik.http.routers.portainer.rule=Host(`docker.giorgioravera.it`)"
-      - "traefik.http.routers.portainer.service=portainer"
-      #- "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
-      #- "traefik.http.routers.portainer.middlewares=portainer-https-redirect"
-      - "traefik.http.routers.portainer-secure.entrypoints=https"
-      - "traefik.http.routers.portainer-secure.rule=Host(`docker.giorgioravera.it`)"
-      - "traefik.http.routers.portainer-secure.tls=true"
-      #- "traefik.http.routers.portainer-secure.tls.certresolver=http"
-      - "traefik.http.routers.portainer-secure.service=portainer"
-      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
-      - "traefik.docker.network=proxy"
-
-networks:
-  proxy:
-    external: true

diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..128fd458bf7af8033a780746ce4c42fa3b638a3d
--- /dev/null
+++ b/portainer/docker-compose.yaml
@@ -0,0 +1 @@
+docker-compose.yaml.net
\ No newline at end of file

diff --git a/portainer/docker-compose.yaml.host b/portainer/docker-compose.yaml.host
new file mode 100644 (file)
index 0000000..6eced7f
--- /dev/null
+++ b/portainer/docker-compose.yaml.host
@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+  portainer:
+    container_name: portainer
+    image: portainer/portainer
+    command: -H unix:///var/run/docker.sock
+    restart: always
+    #ports:
+    #  - 9000:9000
+    environment:
+      - TZ=${DOCKER_TZ}
+    volumes:
+      - ${DOCKER_CFG_DIR}/portainer:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    network_mode: host
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.portainer.entrypoints=http"
+      - "traefik.http.routers.portainer.rule=Host(`docker.giorgioravera.it`)"
+      - "traefik.http.routers.portainer.service=portainer"
+      #- "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
+      #- "traefik.http.routers.portainer.middlewares=portainer-https-redirect"
+      - "traefik.http.routers.portainer-secure.entrypoints=https"
+      - "traefik.http.routers.portainer-secure.rule=Host(`docker.giorgioravera.it`)"
+      - "traefik.http.routers.portainer-secure.tls=true"
+      #- "traefik.http.routers.portainer-secure.tls.certresolver=http"
+      - "traefik.http.routers.portainer-secure.service=portainer"
+      - "traefik.http.services.portainer.loadbalancer.server.port=9000"

diff --git a/portainer/docker-compose.yaml.net b/portainer/docker-compose.yaml.net
new file mode 100644 (file)
index 0000000..4de9082
--- /dev/null
+++ b/portainer/docker-compose.yaml.net
@@ -0,0 +1,35 @@
+version: '3'
+
+services:
+  portainer:
+    container_name: portainer
+    image: portainer/portainer
+    command: -H unix:///var/run/docker.sock
+    restart: always
+    #ports:
+    #  - 9000:9000
+    environment:
+      - TZ=${DOCKER_TZ}
+    volumes:
+      - ${DOCKER_CFG_DIR}/portainer:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.portainer.entrypoints=http"
+      - "traefik.http.routers.portainer.rule=Host(`docker.giorgioravera.it`)"
+      - "traefik.http.routers.portainer.service=portainer"
+      #- "traefik.http.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
+      #- "traefik.http.routers.portainer.middlewares=portainer-https-redirect"
+      - "traefik.http.routers.portainer-secure.entrypoints=https"
+      - "traefik.http.routers.portainer-secure.rule=Host(`docker.giorgioravera.it`)"
+      - "traefik.http.routers.portainer-secure.tls=true"
+      #- "traefik.http.routers.portainer-secure.tls.certresolver=http"
+      - "traefik.http.routers.portainer-secure.service=portainer"
+      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
+      - "traefik.docker.network=proxy"
+
+networks:
+  proxy:
+    external: true

diff --git a/traefik/create_net.sh b/traefik/create_net.sh
new file mode 100755 (executable)
index 0000000..4ee97dc
--- /dev/null
+++ b/traefik/create_net.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker network create --gateway 172.18.0.1 --subnet 172.18.0.0/24 proxy

diff --git a/xen-orchestra-ce/docker-compose.yaml b/xen-orchestra-ce/docker-compose.yaml
index 8938fe34b585cfdaf895a1284cec785906f84cbf..55ec9035c7d462fc6d912a76e5d60674029c19e6 100644 (file)
--- a/xen-orchestra-ce/docker-compose.yaml
+++ b/xen-orchestra-ce/docker-compose.yaml
@@ -42,7 +42,6 @@ services:
       #- "traefik.http.routers.xoa-secure.tls.certresolver=http"
       - "traefik.http.routers.xoa-secure.service=xoa"
       - "traefik.http.services.xoa.loadbalancer.server.port=8000"
-      - "traefik.docker.network=proxy"
 
   redis:
     container_name: XO_redis