Added dns to home assistant and minor update

diff --git a/homeassistant/docker-compose.yaml.host b/homeassistant/docker-compose.yaml.host
index aee422195785716dda5a27370f22d18023a0b701..64cd9228ae8f022eed7919b189bf25dca2a7de92 100644 (file)
--- a/homeassistant/docker-compose.yaml.host
+++ b/homeassistant/docker-compose.yaml.host
@@ -15,6 +15,7 @@ services:
       - TZ=${DOCKER_TZ}
     privileged: true
     #user: "1001:1000"
+    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/homeassistant:/config
     network_mode: host
@@ -23,13 +24,13 @@ services:
       - "traefik.http.routers.homeassistant.entrypoints=http"
       - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)"
       #- "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.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
 
   zigbee2mqtt:
@@ -41,6 +42,7 @@ services:
     environment:
       - TZ=${DOCKER_TZ}
     privileged: true
+    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
       - /run/udev:/run/udev:ro
@@ -62,6 +64,7 @@ services:
       - TZ=${DOCKER_TZ}
     #privileged: true
     user: "1883:1883"
+    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data
       - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config

diff --git a/homeassistant/docker-compose.yaml.net b/homeassistant/docker-compose.yaml.net
index 45ad353a2d5b916a3fd670d420d53e532463ed2d..6b7492f5276f9ec3f40f098aa0687988996a4eb2 100644 (file)
--- a/homeassistant/docker-compose.yaml.net
+++ b/homeassistant/docker-compose.yaml.net
@@ -15,6 +15,7 @@ services:
       - TZ=${DOCKER_TZ}
     privileged: true
     #user: "1001:1000"
+    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/homeassistant:/config
     networks:
@@ -24,13 +25,13 @@ services:
       - "traefik.http.routers.homeassistant.entrypoints=http"
       - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)"
       #- "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.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
       - "traefik.docker.network=proxy"
 
@@ -43,6 +44,7 @@ services:
     environment:
       - TZ=${DOCKER_TZ}
     privileged: true
+    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
       - /run/udev:/run/udev:ro
@@ -64,6 +66,7 @@ services:
       - TZ=${DOCKER_TZ}
     #privileged: true
     user: "1883:1883"
+    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data
       - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config

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

diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..380db23200e02005025d9a4f9b83ce2b606f5cdb
--- /dev/null
+++ b/portainer/docker-compose.yaml
@@ -0,0 +1,35 @@
+version: '3'
+
+services:
+  portainer:
+    container_name: portainer
+    image: portainer/portainer:latest
+    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
+    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.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.middlewares.portainer-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
+
+networks:
+  proxy:
+    external: true

diff --git a/portainer/docker-compose.yaml.host b/portainer/docker-compose.yaml.host
deleted file mode 100644 (file)
index 6eced7f..0000000
--- a/portainer/docker-compose.yaml.host
+++ /dev/null
@@ -1,29 +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
-    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
deleted file mode 100644 (file)
index a5a3b9f..0000000
--- a/portainer/docker-compose.yaml.net
+++ /dev/null
@@ -1,34 +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"
-
-networks:
-  proxy:
-    external: true

diff --git a/pydio-cells/docker-compose.yaml b/pydio-cells/docker-compose.yaml
index f4056bbd8262adddac39f995f901d13b9bace59d..32440cf8b43748d0e444d599e8bdba0bd193bc9a 100644 (file)
--- a/pydio-cells/docker-compose.yaml
+++ b/pydio-cells/docker-compose.yaml
@@ -21,13 +21,13 @@ services:
       - "traefik.http.routers.pydio.entrypoints=http"
       - "traefik.http.routers.pydio.rule=Host(`cloud.giorgioravera.it`)"
       - "traefik.http.routers.pydio.service=pydio"
-      #- "traefik.http.middlewares.pydio-https-redirect.redirectscheme.scheme=https"
       #- "traefik.http.routers.pydio.middlewares=pydio-https-redirect"
       - "traefik.http.routers.pydio-secure.entrypoints=https"
       - "traefik.http.routers.pydio-secure.rule=Host(`cloud.giorgioravera.it`)"
       - "traefik.http.routers.pydio-secure.tls=true"
       #- "traefik.http.routers.pydio-secure.tls.certresolver=http"
       - "traefik.http.routers.pydio-secure.service=pydio"
+      #- "traefik.http.middlewares.pydio-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.services.pydio.loadbalancer.server.port=8080"
 
 networks:

diff --git a/xen-orchestra-ce/docker-compose.yaml b/xen-orchestra-ce/docker-compose.yaml
index 55ec9035c7d462fc6d912a76e5d60674029c19e6..4436f8413b8b8efa2243dcefa0d79f1adaeb43da 100644 (file)
--- a/xen-orchestra-ce/docker-compose.yaml
+++ b/xen-orchestra-ce/docker-compose.yaml
@@ -34,13 +34,13 @@ services:
       - "traefik.http.routers.xoa.entrypoints=http"
       - "traefik.http.routers.xoa.rule=Host(`xoa.giorgioravera.it`)"
       - "traefik.http.routers.xoa.service=xoa"
-      #- "traefik.http.middlewares.xoa-https-redirect.redirectscheme.scheme=https"
       #- "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"
       #- "traefik.http.routers.xoa-secure.tls.certresolver=http"
       - "traefik.http.routers.xoa-secure.service=xoa"
+      #- "traefik.http.middlewares.xoa-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.services.xoa.loadbalancer.server.port=8000"
 
   redis: