From 8bcd8f054eca6bb491f75454305cbe3f5ceeb655 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 7 Aug 2021 17:03:20 +0200
Subject: [PATCH 1/3] Add missing Mumble vars to .env.sample

---
 .env.sample | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.sample b/.env.sample
index d09478f..5b43341 100644
--- a/.env.sample
+++ b/.env.sample
@@ -59,3 +59,6 @@ LOG_LEVEL=WARN
 
 ## "Headless mode" (no domain configured)
 #COMPOSE_FILE="compose.yml:compose.headless.yml"
+## Mumble
+#COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml"
+#MUMBLE_ENABLED=1

From e856591c97cba191424f3f375b7e30fdd8da4adf Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 7 Aug 2021 17:03:52 +0200
Subject: [PATCH 2/3] `COMPOSE_FILE=$COMPOSE_FILE:`, to combine 'em easier

Thanks, @mirsal
---
 .env.sample | 70 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/.env.sample b/.env.sample
index 5b43341..12d98c6 100644
--- a/.env.sample
+++ b/.env.sample
@@ -8,57 +8,75 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 # WARN, INFO etc.
 LOG_LEVEL=WARN
 
+#####################################################################
+# General settings                                                  #
+#####################################################################
+
+## Host-mode networking
+#COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
+
+## "Headless mode" (no domain configured)
+#COMPOSE_FILE="$COMPOSE_FILE:compose.headless.yml"
+
+#####################################################################
+# Automatic DNS set-up for Letsencrypt                              #
+#####################################################################
+
 ## Enable dns challenge (for wildcard domains)
 ##   https://doc.traefik.io/traefik/https/acme/#dnschallenge
 #LETS_ENCRYPT_DNS_CHALLENGE_ENABLED=1
 #LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER=ovh
 
-## OVH configuration
-# COMPOSE_FILE="compose.yml:compose.ovh.yml"
-# OVH_ENABLED=1
-# OVH_APPLICATION_KEY=
-# OVH_ENDPOINT=
-# SECRET_OVH_APP_SECRET_VERSION=v1
-# SECRET_OVH_CONSUMER_KEY=v1
+## OVH, https://ovh.com
+#COMPOSE_FILE="$COMPOSE_FILE:compose.ovh.yml"
+#OVH_ENABLED=1
+#OVH_APPLICATION_KEY=
+#OVH_ENDPOINT=
+#SECRET_OVH_APP_SECRET_VERSION=v1
+#SECRET_OVH_CONSUMER_KEY=v1
 
-## Gandi configuration
-# COMPOSE_FILE="compose.yml:compose.gandi.yml"
-# GANDI_ENABLED=1
-# SECRET_GANDIV5_API_KEY_VERSION=v1
+## Gandi, https://gandi.net
+## note(3wc): only "V5" (new) API is supported, so far
+#COMPOSE_FILE="$COMPOSE_FILE:compose.gandi.yml"
+#GANDI_ENABLED=1
+#SECRET_GANDIV5_API_KEY_VERSION=v1
+
+#####################################################################
+# Keycloak log-in                                                   #
+#####################################################################
 
 ## Enable Keycloak
-#COMPOSE_FILE="compose.yml:compose.keycloak.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #KEYCLOAK_MIDDLEWARE_ENABLED=1
 
+#####################################################################
+# Additional services                                               #
+#####################################################################
+
 ## SMTP port 587
-#COMPOSE_FILE="compose.yml:compose.smtp.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 #SMTP_ENABLED=1
 
 ## Gitea SSH
-# COMPOSE_FILE="compose.yml:compose.gitea.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
 # GITEA_SSH_ENABLED=1
 
 ## Foodsoft SMTP
-# COMPOSE_FILE="compose.yml:compose.foodsoft.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.foodsoft.yml"
 # FOODSOFT_SMTP_ENABLED=1
 
 ## Peertube RTMP
-# COMPOSE_FILE="compose.yml:compose.peertube.yml"
-# PEERTUBE_RTMP_ENABLED=1
+#COMPOSE_FILE="$COMPOSE_FILE:compose.peertube.yml"
+#PEERTUBE_RTMP_ENABLED=1
 
 ## Secure Scuttlebutt MUXRPC
-# COMPOSE_FILE="compose.yml:compose.ssb.yml"
-# SSB_MUXRPC_ENABLED=1
+#COMPOSE_FILE="$COMPOSE_FILE:compose.ssb.yml"
+#SSB_MUXRPC_ENABLED=1
 
 ## MSSQL
-# COMPOSE_FILE="compose.yml:compose.mssql.yml"
-# MSSQL_ENABLED=1
+#COMPOSE_FILE="$COMPOSE_FILE:compose.mssql.yml"
+#MSSQL_ENABLED=1
 
-## Host-mode networking
-#COMPOSE_FILE="compose.yml:compose.host.yml"
-
-## "Headless mode" (no domain configured)
-#COMPOSE_FILE="compose.yml:compose.headless.yml"
 ## Mumble
 #COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml"
 #MUMBLE_ENABLED=1

From baba7ff87d7fae4540873fd5a8be209dcb34455c Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 7 Aug 2021 19:49:29 +0200
Subject: [PATCH 3/3] Add default COMPOSE_FILE

---
 .env.sample | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.env.sample b/.env.sample
index 12d98c6..e4b9981 100644
--- a/.env.sample
+++ b/.env.sample
@@ -8,6 +8,10 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 # WARN, INFO etc.
 LOG_LEVEL=WARN
 
+# This is here so later lines can extend the definition; you likely don't wanna
+# edit
+COMPOSE_FILE="compose.yml"
+
 #####################################################################
 # General settings                                                  #
 #####################################################################