From f5c2f196cc364524c88b122e2afd3f5756ae8249 Mon Sep 17 00:00:00 2001
From: Jonas 12t <jturbeaux@pm.me>
Date: Tue, 1 Jun 2021 13:41:27 +0400
Subject: [PATCH] first

---
 docker-compose.yml | 41 +++++++++++++++++++++++++++++------------
 env_example        |  2 +-
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 13a384c..604f122 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,16 +5,15 @@ services:
   peertube:
     image: chocobozzz/peertube:production-buster
     networks:
-      default:
-        ipv4_address: 172.36.0.42
+      - frontend
     env_file:
       - .env
 
     ports:
      - "1935:1935"
-     - "127.0.0.1:3001:9000"
+     # - "127.0.0.1:3001:9000"
     volumes:
-      - assets:/app/client/dist
+      - ./dist:/app/client/dist
       - ./docker-volume/data:/data
       - ./docker-volume/config:/config
     depends_on:
@@ -22,8 +21,23 @@ services:
       - redis
     restart: "always"
 
+    labels:
+      - "traefik.enable=true"
+      - "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.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"
+
+
   postgres:
     image: postgres:13-alpine
+    networks:
+      - frontend
     env_file:
       - .env
     volumes:
@@ -31,17 +45,20 @@ services:
     restart: "always"
 
   redis:
+    networks:
+      - frontend
     image: redis:6-alpine
     volumes:
       - ./docker-volume/redis:/data
     restart: "always"
 
-networks:
-  default:
-    ipam:
-      driver: default
-      config:
-      - subnet: 172.36.0.0/16
 
-volumes:
-  assets:
\ No newline at end of file
+networks:
+  frontend:
+    external: true
+  # default:
+    # ipam:
+      # driver: default
+      # config:
+      # - subnet: 172.36.0.0/16
+
diff --git a/env_example b/env_example
index 543729b..c19bcb4 100644
--- a/env_example
+++ b/env_example
@@ -16,7 +16,7 @@ PEERTUBE_DB_SSL=false
 PEERTUBE_DB_HOSTNAME=postgres
 
 # Server configuration
-PEERTUBE_WEBSERVER_HOSTNAME=peertube.localhost
+PEERTUBE_WEBSERVER_HOSTNAME=peertube.3peaks.re
 
 # If you do not use https and a reverse-proxy in docker-compose.yml
 #PEERTUBE_WEBSERVER_PORT=80