Added homeassistant & fixes

diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
new file mode 100644 (file)
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 3fd399e49dbbb46c79a7e9dc3bb6a6d907e68316..e2a01e599b017a56ca59acffd31e98f0a33ebca6 100644 (file)
--- 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.yaml b/traefik/docker-compose.yaml
new file mode 100644 (file)
index 0000000..0e080ee
--- /dev/null
+++ b/traefik/docker-compose.yaml
@@ -0,0 +1,50 @@
+version: '3'
+
+services:
+  traefik:
+    container_name: traefik
+    image: traefik:v2.0
+#    command:
+#      - --api
+#      - --api.dashboard
+#      - --entrypoints.http.address=:80
+#      - --entrypoints.https.address=:443
+#      - --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:
+      - ${DOCKER_CFG_DIR}/traefik/traefik.yml:/traefik.yml:ro
+      - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
+      - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
+      - ${DOCKER_CFG_DIR}/traefik/config:/config
+      - /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
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.traefik.entrypoints=http"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
+      - "traefik.http.routers.traefik.service=api@internal"
+      - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
+      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.routers.traefik-secure.entrypoints=https"
+      - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
+      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      - "traefik.http.routers.traefik-secure.tls=true"
+      #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
+      - "traefik.http.routers.traefik-secure.service=api@internal"
+      - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
+
+networks:
+  proxy:
+    external: true

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
deleted file mode 100644 (file)
index d0dd4e0..0000000
--- a/traefik/docker-compose.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    container_name: traefik
-    image: traefik:v2.0
-    restart: unless-stopped
-    ports:
-      - 80:80
-      - 443:443
-#    command:
-#      - --api
-#      - --api.dashboard
-#      - --entrypoints.http.address=:80
-#      - --entrypoints.https.address=:443
-#      - --providers.docker=true
-#      - --providers.file.watch=true
-#      - --log.level=DEBUG
-    environment:
-      - TZ=${DOCKER_TZ}
-    volumes:
-      - ${DOCKER_CFG_DIR}/traefik/traefik.yml:/traefik.yml:ro
-      - ${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
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik.entrypoints=http"
-      - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
-      - "traefik.http.routers.traefik.service=api@internal"
-      - "traefik.http.routers.traefik.middlewares=traefik-auth"
-      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
-      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.routers.traefik-secure.entrypoints=https"
-      - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
-      - "traefik.http.routers.traefik-secure.tls=true"
-      #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
-      - "traefik.http.routers.traefik-secure.service=api@internal"
-      - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
-
-networks:
-  proxy:
-    external: true

diff --git a/xen-orchestra-ce/docker-compose.yaml b/xen-orchestra-ce/docker-compose.yaml
new file mode 100644 (file)
index 0000000..8d35efa
--- /dev/null
+++ b/xen-orchestra-ce/docker-compose.yaml
@@ -0,0 +1,61 @@
+version: '3'
+
+services:
+  orchestra:
+    container_name: XO_server
+    image: ezka77/xen-orchestra-ce
+    restart: unless-stopped
+    #ports:
+    #  - 8080:8000
+    depends_on:
+      - redis
+    environment:
+      - DEBUG=xo:main
+      - NODE_ENV=production
+      - XOA_PLAN=5
+      # To enable XO superuser features (ex: NFS mount) on the host
+      # uncomment the following lines, it will start XO as superuser
+      # and enable the privileged capabilities for this container (access
+      # host devices, ...) NB: it's a security issue, so be warned !
+      #- USER=root
+      - TZ=${DOCKER_TZ}
+    #privileged: true
+    volumes:
+      - ${DOCKER_CFG_DIR}/xoa_data:/storage
+    networks:
+      - proxy
+    logging: &logging
+      driver: "json-file"
+      options:
+         max-size: "1M"
+         max-file: "2"
+    labels:
+      - "traefik.enable=true"
+      - "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=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.services.xoa.loadbalancer.server.port=8000"
+      - "traefik.docker.network=proxy"
+
+  redis:
+    container_name: XO_redis
+    image: redis:alpine
+    command: redis-server --appendonly yes
+    restart: unless-stopped
+    volumes:
+      #- xoa_data:/data
+      - ${DOCKER_CFG_DIR}/xoa_data:/data
+    networks:
+      - proxy
+    logging:
+      <<: *logging
+
+networks:
+  proxy:
+    external: true

diff --git a/xen-orchestra-ce/docker-compose.yml b/xen-orchestra-ce/docker-compose.yml
deleted file mode 100644 (file)
index 06795d2..0000000
--- a/xen-orchestra-ce/docker-compose.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-version: '3'
-
-services:
-  orchestra:
-    container_name: XO_server
-    image: ezka77/xen-orchestra-ce
-    restart: unless-stopped
-    #ports:
-    #  - 8080:8000
-    depends_on:
-      - redis
-    environment:
-      - DEBUG=xo:main
-      - NODE_ENV=production
-      - XOA_PLAN=5
-      # To enable XO superuser features (ex: NFS mount) on the host
-      # uncomment the following lines, it will start XO as superuser
-      # and enable the privileged capabilities for this container (access
-      # host devices, ...) NB: it's a security issue, so be warned !
-      #- USER=root
-      - TZ=${DOCKER_TZ}
-    #privileged: true
-    volumes:
-      - ${DOCKER_CFG_DIR}/xoa_data:/storage
-    networks:
-      - proxy
-    logging: &logging
-      driver: "json-file"
-      options:
-         max-size: "1M"
-         max-file: "2"
-    labels:
-      - "traefik.enable=true"
-      - "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-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.services.xoa.loadbalancer.server.port=8000"
-      - "traefik.docker.network=proxy"
-
-  redis:
-    container_name: XO_redis
-    image: redis:alpine
-    command: redis-server --appendonly yes
-    restart: unless-stopped
-    volumes:
-      #- xoa_data:/data
-      - ${DOCKER_CFG_DIR}/xoa_data:/data
-    networks:
-      - proxy
-    logging:
-      <<: *logging
-
-networks:
-  proxy:
-    external: true