From f608f060a0fbdc59e925fa6ec38b01ad2e7d3a0a Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 3 Oct 2021 14:22:22 +0200
Subject: [PATCH] replace traefik by nginx-proxy

---
 blog/docker-compose.blog.yml               |  8 ++------
 dokuwiki/docker-compose.dokuwiki.yml       | 10 +++-------
 nginx-proxy/docker-compose.nginx-local.yml | 18 ++++++++++++++++++
 selfoss/docker-compose.selfoss.yml         |  9 +++------
 shaarli/docker-compose.shaarli.yml         |  8 ++------
 traefik/docker-compose.traefik.yml         |  0
 wallabag/docker-compose.wallabag.yml       |  8 ++------
 www/docker-compose.www.yml                 |  9 +++------
 8 files changed, 33 insertions(+), 37 deletions(-)
 mode change 100644 => 100755 blog/docker-compose.blog.yml
 create mode 100755 nginx-proxy/docker-compose.nginx-local.yml
 mode change 100755 => 100644 traefik/docker-compose.traefik.yml

diff --git a/blog/docker-compose.blog.yml b/blog/docker-compose.blog.yml
old mode 100644
new mode 100755
index eb7b6b2..df66226
--- a/blog/docker-compose.blog.yml
+++ b/blog/docker-compose.blog.yml
@@ -21,9 +21,5 @@ services:
     restart: unless-stopped
     expose:
       - 80
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.blog.rule=Host(`${HOST_BLOG}.${DOMAIN}`)
-      - traefik.http.routers.blog.entrypoints=websecure
-      - traefik.http.routers.blog.tls=true
-      - traefik.http.services.blog.loadbalancer.server.port=80        
\ No newline at end of file
+    environment:
+      - VIRTUAL_HOST=${HOST_BLOG}.${DOMAIN}      
diff --git a/dokuwiki/docker-compose.dokuwiki.yml b/dokuwiki/docker-compose.dokuwiki.yml
index fddf39f..a648379 100755
--- a/dokuwiki/docker-compose.dokuwiki.yml
+++ b/dokuwiki/docker-compose.dokuwiki.yml
@@ -13,12 +13,8 @@ services:
     volumes:
       - ${ROOT_INSTALL}/data/dokuwiki:/config
     networks:
-      - srv    
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.dokuwiki.rule=Host(`${HOST_DOKUWIKI}.${DOMAIN}`)
-      - traefik.http.routers.dokuwiki.entrypoints=websecure
-      - traefik.http.routers.dokuwiki.tls=true
-      - traefik.http.services.dokuwiki.loadbalancer.server.port=80
+      - srv
+    environment:
+      - VIRTUAL_HOST=${HOST_DOKUWIKI}.${DOMAIN}    
 
 
diff --git a/nginx-proxy/docker-compose.nginx-local.yml b/nginx-proxy/docker-compose.nginx-local.yml
new file mode 100755
index 0000000..8e40245
--- /dev/null
+++ b/nginx-proxy/docker-compose.nginx-local.yml
@@ -0,0 +1,18 @@
+version: '3'
+
+services:
+  nginx-proxy:
+    container_name: nginx-proxy
+    image: nginxproxy/nginx-proxy
+    ports:
+      - 80:80
+      - 443:443 
+    environment:
+      - DEFAULT_HOST=${DOMAIN}
+      - DHPARAM_GENERATION=false
+    networks:
+      - srv             
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${ROOT_INSTALL}/data/nginx-proxy/certs:/etc/nginx/certs
+      - ${ROOT_INSTALL}/data/nginx-proxy/vhost.d:/etc/nginx/vhost.d:ro
\ No newline at end of file
diff --git a/selfoss/docker-compose.selfoss.yml b/selfoss/docker-compose.selfoss.yml
index b02196a..ea51ddd 100755
--- a/selfoss/docker-compose.selfoss.yml
+++ b/selfoss/docker-compose.selfoss.yml
@@ -11,12 +11,9 @@ services:
     restart: unless-stopped
     expose:
       - 8888
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.selfoss.rule=Host(`${HOST_SELFOSS}.${DOMAIN}`)
-      - traefik.http.routers.selfoss.entrypoints=websecure
-      - traefik.http.routers.selfoss.tls=true
-      - traefik.http.services.selfoss.loadbalancer.server.port=8888       
+    environment:
+      - VIRTUAL_HOST=${HOST_SELFOSS}.${DOMAIN}
+      - VIRTUAL_PORT=8888      
 
 volumes: 
   selfoss_data:      
\ No newline at end of file
diff --git a/shaarli/docker-compose.shaarli.yml b/shaarli/docker-compose.shaarli.yml
index ba88e6a..a17cfdb 100755
--- a/shaarli/docker-compose.shaarli.yml
+++ b/shaarli/docker-compose.shaarli.yml
@@ -12,12 +12,8 @@ services:
     restart: unless-stopped
     expose:
       - 80
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.shaarli.rule=Host(`${HOST_SHAARLI}.${DOMAIN}`)
-      - traefik.http.routers.shaarli.entrypoints=websecure
-      - traefik.http.routers.shaarli.tls=true
-      - traefik.http.services.shaarli.loadbalancer.server.port=80       
+    environment:
+      - VIRTUAL_HOST=${HOST_SHAARLI}.${DOMAIN}     
 
 volumes:
   shaarli-data:
diff --git a/traefik/docker-compose.traefik.yml b/traefik/docker-compose.traefik.yml
old mode 100755
new mode 100644
diff --git a/wallabag/docker-compose.wallabag.yml b/wallabag/docker-compose.wallabag.yml
index 960aebb..8e71157 100755
--- a/wallabag/docker-compose.wallabag.yml
+++ b/wallabag/docker-compose.wallabag.yml
@@ -19,12 +19,8 @@ services:
     volumes:
     - wallabag_data:/var/www/wallabag/data:rw
     - wallabag_images:/var/www/wallabag/web/assets/images:rw
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.wallabag.rule=Host(`${HOST_WALLABAG}.${DOMAIN}`)
-      - traefik.http.routers.wallabag.entrypoints=websecure
-      - traefik.http.routers.wallabag.tls=true
-      - traefik.http.services.wallabag.loadbalancer.server.port=80 
+    environment:
+      - VIRTUAL_HOST=${HOST_WALLABAG}.${DOMAIN}
 
 volumes:
   wallabag_data: 
diff --git a/www/docker-compose.www.yml b/www/docker-compose.www.yml
index 1d8bf6d..44ea8e7 100755
--- a/www/docker-compose.www.yml
+++ b/www/docker-compose.www.yml
@@ -9,9 +9,6 @@ services:
       - srv
     expose:
       - 80
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.www.rule=Host(`${HOST_WWW}.${DOMAIN}`) 
-      - traefik.http.routers.www.entrypoints=websecure
-      - traefik.http.routers.www.tls=true
-      - traefik.http.services.www.loadbalancer.server.port=80
+    environment:
+      - VIRTUAL_HOST=${DOMAIN},${HOST_WWW}.${DOMAIN}
+