From 8bb670d33e4ef5ebefaf387f8b0fa4bee0fffeb3 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 24 Oct 2021 10:07:24 +0200
Subject: [PATCH] https hosts

---
 blog/docker-compose.blog.yml           | 3 ++-
 deluge/docker-compose.deluge.yml       | 3 ++-
 dokuwiki/docker-compose.dokuwiki.yml   | 3 ++-
 glances/docker-compose.glances.yml     | 6 ++++--
 portainer/docker-compose.portainer.yml | 3 ++-
 selfoss/docker-compose.selfoss.yml     | 3 ++-
 shaarli/docker-compose.shaarli.yml     | 1 +
 wallabag/docker-compose.wallabag.yml   | 1 +
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/blog/docker-compose.blog.yml b/blog/docker-compose.blog.yml
index df66226..c90f88b 100755
--- a/blog/docker-compose.blog.yml
+++ b/blog/docker-compose.blog.yml
@@ -22,4 +22,5 @@ services:
     expose:
       - 80
     environment:
-      - VIRTUAL_HOST=${HOST_BLOG}.${DOMAIN}      
+      - VIRTUAL_HOST=${HOST_BLOG}.${DOMAIN}
+      - LETSENCRYPT_HOST=${HOST_BLOG}.${DOMAIN}
diff --git a/deluge/docker-compose.deluge.yml b/deluge/docker-compose.deluge.yml
index 0924eb5..0399a6e 100755
--- a/deluge/docker-compose.deluge.yml
+++ b/deluge/docker-compose.deluge.yml
@@ -33,8 +33,9 @@ services:
     expose:
       - 80
     environment:
+      - HTTPS_METHOD=nohttps
       - VIRTUAL_HOST=${HOST_DELUGE_DOWNLOAD}.${DOMAIN}
-      - HTTPS_METHOD=nohttps         
+      - LETSENCRYPT_HOST=${HOST_DELUGE_DOWNLOAD}.${DOMAIN}
     
 volumes:
   deluge_config:
diff --git a/dokuwiki/docker-compose.dokuwiki.yml b/dokuwiki/docker-compose.dokuwiki.yml
index 25eef68..63542ac 100755
--- a/dokuwiki/docker-compose.dokuwiki.yml
+++ b/dokuwiki/docker-compose.dokuwiki.yml
@@ -15,4 +15,5 @@ services:
     networks:
       - srv
     environment:
-      - VIRTUAL_HOST=${HOST_DOKUWIKI}.${DOMAIN}    
+      - VIRTUAL_HOST=${HOST_DOKUWIKI}.${DOMAIN}
+      - LETSENCRYPT_HOST=${HOST_DOKUWIKI}.${DOMAIN}
\ No newline at end of file
diff --git a/glances/docker-compose.glances.yml b/glances/docker-compose.glances.yml
index 7494f54..3637021 100755
--- a/glances/docker-compose.glances.yml
+++ b/glances/docker-compose.glances.yml
@@ -12,6 +12,8 @@ services:
     expose:
       - 61208
     environment:
-      - GLANCES_OPT=-w    
-      - VIRTUAL_HOST=${HOST_GLANCES}.${DOMAIN}
+      - GLANCES_OPT=-w 
       - VIRTUAL_PORT=61208
+      - VIRTUAL_HOST=${HOST_GLANCES}.${DOMAIN}
+      - LETSENCRYPT_HOST=${HOST_GLANCES}.${DOMAIN}      
+
diff --git a/portainer/docker-compose.portainer.yml b/portainer/docker-compose.portainer.yml
index 6fc6fc9..16dae84 100755
--- a/portainer/docker-compose.portainer.yml
+++ b/portainer/docker-compose.portainer.yml
@@ -14,8 +14,9 @@ services:
     expose:
       - 9000
     environment:
+      - VIRTUAL_PORT=9000    
       - VIRTUAL_HOST=${HOST_PORTAINER}.${DOMAIN}
-      - VIRTUAL_PORT=9000             
+      - LETSENCRYPT_HOST=${HOST_PORTAINER}.${DOMAIN}
 
 volumes:
   portainer_data:
diff --git a/selfoss/docker-compose.selfoss.yml b/selfoss/docker-compose.selfoss.yml
index ea51ddd..b4e69c8 100755
--- a/selfoss/docker-compose.selfoss.yml
+++ b/selfoss/docker-compose.selfoss.yml
@@ -12,8 +12,9 @@ services:
     expose:
       - 8888
     environment:
+      - VIRTUAL_PORT=8888     
       - VIRTUAL_HOST=${HOST_SELFOSS}.${DOMAIN}
-      - VIRTUAL_PORT=8888      
+      - LETSENCRYPT_HOST=${HOST_SELFOSS}.${DOMAIN}
 
 volumes: 
   selfoss_data:      
\ No newline at end of file
diff --git a/shaarli/docker-compose.shaarli.yml b/shaarli/docker-compose.shaarli.yml
index a17cfdb..adee4ed 100755
--- a/shaarli/docker-compose.shaarli.yml
+++ b/shaarli/docker-compose.shaarli.yml
@@ -14,6 +14,7 @@ services:
       - 80
     environment:
       - VIRTUAL_HOST=${HOST_SHAARLI}.${DOMAIN}     
+      - LETSENCRYPT_HOST=${HOST_SHAARLI}.${DOMAIN}
 
 volumes:
   shaarli-data:
diff --git a/wallabag/docker-compose.wallabag.yml b/wallabag/docker-compose.wallabag.yml
index a487998..77d678e 100755
--- a/wallabag/docker-compose.wallabag.yml
+++ b/wallabag/docker-compose.wallabag.yml
@@ -16,6 +16,7 @@ services:
       - SYMFONY__ENV__DOMAIN_NAME="https://${HOST_WALLABAG}.${DOMAIN}"
       - SYMFONY__ENV__FOSUSER_REGISTRATION=false    
       - VIRTUAL_HOST=${HOST_WALLABAG}.${DOMAIN}
+      - LETSENCRYPT_HOST=${HOST_WALLABAG}.${DOMAIN}
 
 volumes:
   wallabag_data: