From 77c544549a1637865c9f463047d89819ad96541f Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Wed, 27 Nov 2024 17:03:48 +0100
Subject: [PATCH] clean and command environnement variable
---
.env.sample | 45 ++++++++++++---------------------------------
docker-compose.yml | 16 ++++++++--------
2 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/.env.sample b/.env.sample
index 5890d4c..d480ed6 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,45 +5,24 @@
COMPOSE_FILE=docker-compose.yml:ports.yml
# Host and Name for traefik
-HOST=localhost
+HOST=
NAME=peertube
+# Peertune secret
+PEERTUBE_SECRET=
-SUBNET=172.10.0.0/16
-# Must be within SUBNET
-IP=172.10.0.10
# Database / Postgres service configuration
-POSTGRES_USER=peertube
-POSTGRES_PASSWORD=peertube
-POSTGRES_DB=peertube
-# Editable only with a suffix :
-#POSTGRES_DB=peertube_prod
-#PEERTUBE_DB_SUFFIX=_prod
-# MUST be the same as POSTGRE USER and PASSWORD
-PEERTUBE_DB_USERNAME=peertube
-PEERTUBE_DB_PASSWORD=peertube
-PEERTUBE_DB_SSL=false
-# Default to Postgres service name "postgres" in docker-compose.yml
-PEERTUBE_DB_HOSTNAME=postgres
-
-# PeerTube server configuration
-# If you test PeerTube in local: use "peertube.localhost" and add this domain to your host file resolving on 127.0.0.1
-PEERTUBE_WEBSERVER_HOSTNAME=localhost
-# If you just want to test PeerTube on local
-PEERTUBE_WEBSERVER_PORT=80
-PEERTUBE_WEBSERVER_HTTPS=false
-# If you need more than one IP as trust_proxy
-# pass them as a comma separated array:
-# Must include Subnet
-# PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
-
-# Generate one using `openssl rand -hex 32`
-PEERTUBE_SECRET=peertubesecret
+DB_USER=
+DB_PASSWORD=
+DB_NAME=peertube
# E-mail configuration
-PEERTUBE_SMTP_HOSTNAME=mail.gandi.net
+## SMTP serveur like "mail.gandi.net"
+PEERTUBE_SMTP_HOSTNAME=
PEERTUBE_SMTP_PORT=25
-PEERTUBE_SMTP_FROM=peertube@tetras-libre.fr
+## Peertube from like peertube@FQDN
+PEERTUBE_SMTP_FROM=
PEERTUBE_SMTP_TLS=false
PEERTUBE_SMTP_DISABLE_STARTTLS=false
-PEERTUBE_ADMIN_EMAIL=elian.loraux@tetras-libre.fr
+## Admin mail
+PEERTUBE_ADMIN_EMAIL=
diff --git a/docker-compose.yml b/docker-compose.yml
index 078adb7..73400ed 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,14 +7,14 @@ services:
environment:
# General configuration
- PEERTUBE_SECRET=${PEERTUBE_SECRET}
- - PEERTUBE_WEBSERVER_HOSTNAME=${PEERTUBE_WEBSERVER_HOSTNAME}
+ - PEERTUBE_WEBSERVER_HOSTNAME=${HOST}
- PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
- PEERTUBE_WEBSERVER_PORT=80
- PEERTUBE_WEBSERVER_HTTPS=false
# Data base configuration
- - PEERTUBE_DB_USERNAME=${POSTGRES_USER}
- - PEERTUBE_DB_PASSWORD=${POSTGRES_PASSWORD}
- - PEERTUBE_DB_HOSTNAME=${PEERTUBE_DB_HOSTNAME}
+ - PEERTUBE_DB_USERNAME=${DB_USER}
+ - PEERTUBE_DB_PASSWORD=${DB_PASSWORD}
+ - PEERTUBE_DB_HOSTNAME=postgres
- PEERTUBE_DB_SSL=false
# Email configuration
- PEERTUBE_SMTP_HOSTNAME=${PEERTUBE_SMTP_HOSTNAME}
@@ -38,14 +38,14 @@ services:
postgres:
image: postgres:13-alpine
environment:
- - POSTGRES_USER=${POSTGRES_USER}
- - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- - POSTGRES_DB=${POSTGRES_DB}
+ - POSTGRES_USER=${DB_USER}
+ - POSTGRES_PASSWORD=${DB_PASSWORD}
+ - POSTGRES_DB=${DB_NAME}
volumes:
- ./docker-volume/db:/var/lib/postgresql/data
restart: "always"
healthcheck:
- test: ["CMD-SHELL", "pg_isready", "-d", "${POSTGRES_DB}"]
+ test: ["CMD-SHELL", "pg_isready", "-d", "${DB_NAME}"]
interval: 30s
timeout: 60s
retries: 5
--
GitLab