From f3902b2529f357f6e1ec00e0774ba62e31c42a09 Mon Sep 17 00:00:00 2001
From: Jonas 12t <jturbeaux@pm.me>
Date: Wed, 2 Jun 2021 17:10:25 +0400
Subject: [PATCH] labeu

---
 docker-compose.yml       | 26 ++++++++++++--------------
 labeu/docker-compose.yml | 16 ++++++++++------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5458f4d..26a4b37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   postgres:
     image: postgres:13-alpine
     networks:
-      - frontend_labeu
+      - frontend
     env_file:
       - .env
     volumes:
@@ -14,7 +14,7 @@ services:
 
   redis:
     networks:
-      - frontend_labeu
+      - frontend
     image: redis:6-alpine
     volumes:
       - ./docker-volume/redis:/data
@@ -24,15 +24,15 @@ services:
   peertube:
     image: chocobozzz/peertube:production-buster
     networks:
-      - frontend_labeu
+      - frontend
     env_file:
       - .env
 
-    # ports:
-     # - "1935:1935"
-     # - "127.0.0.1:3001:9000"
+    ports:
+     - "1935:1935"
+     - "127.0.0.1:3001:9000"
     volumes:
-      # - ./dist:/app/client/dist
+      - ./dist:/app/client/dist
       - ./docker-volume/data:/data
       - ./docker-volume/config:/config
     depends_on:
@@ -42,24 +42,22 @@ services:
 
     labels:
       - "traefik.enable=true"
-      - "traefik.docker.network=frontend_labeu"
-
-      - "traefik.http.routers.peertube-http.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.peertube-http.rule=Host(`peertube.3peaks.re`)"
       - "traefik.http.routers.peertube-http.entrypoints=entrypoints-http"
       - "traefik.http.routers.peertube-http.middlewares=redirect"
       - "traefik.http.middlewares.redirect.redirectscheme.scheme=https"
-      
-      - "traefik.http.routers.peertube-https.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)"
+      - "traefik.http.routers.peertube-https.rule=Host(`peertube.3peaks.re`)"
       - "traefik.http.routers.peertube-https.entrypoints=entrypoints-https"
       - "traefik.http.routers.peertube-https.tls.certresolver=myresolver"
-      - "traefik.http.services.peertube.loadbalancer.server.port=9000"
+      - "traefik.http.services.peertube.loadbalancer.server.port=3001"
 
 
 
 
 
 networks:
-  frontend_labeu:
+  frontend:
     external: true
   # default:
     # ipam:
diff --git a/labeu/docker-compose.yml b/labeu/docker-compose.yml
index 4678b7c..4a6a57d 100644
--- a/labeu/docker-compose.yml
+++ b/labeu/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
 
-  postgres:
+  postgres_labeu:
     image: postgres:13-alpine
     networks:
       - frontend_labeu
@@ -12,7 +12,7 @@ services:
       - ./docker-volume/db:/var/lib/postgresql/data
     restart: "always"
 
-  redis:
+  redis_labeu:
     networks:
       - frontend_labeu
     image: redis:6-alpine
@@ -21,7 +21,7 @@ services:
     restart: "always"
 
     
-  peertube:
+  peertube_labeu:
     image: chocobozzz/peertube:production-buster
     networks:
       - frontend_labeu
@@ -32,11 +32,14 @@ services:
      # - "1935:1935"
      # - "127.0.0.1:3001:9000"
     volumes:
-      - ./assets:/app/client/dist2
+      - ./dist:/app/client/dist2
       - ./docker-volume/data:/data
       - ./docker-volume/config:/config
+    links:
+      - postgres_labeu:postgres
+      - redis_labeu:redis
     depends_on:
-      - postgres
+      - postgres_labeu
       - redis
     restart: "always"
 
@@ -48,7 +51,7 @@ services:
       - "traefik.http.routers.peertube-http.entrypoints=entrypoints-http"
       - "traefik.http.routers.peertube-http.middlewares=redirect"
       - "traefik.http.middlewares.redirect.redirectscheme.scheme=https"
-      
+
       - "traefik.http.routers.peertube-https.rule=Host(`${PEERTUBE_WEBSERVER_HOSTNAME}`)"
       - "traefik.http.routers.peertube-https.entrypoints=entrypoints-https"
       - "traefik.http.routers.peertube-https.tls.certresolver=myresolver"
@@ -57,6 +60,7 @@ services:
 
 
 
+
 networks:
   frontend_labeu:
     external: true