From ee24cea971e0a79eded058c3a1ba3ceadcd12422 Mon Sep 17 00:00:00 2001
From: Sandeep Raghuraman <sandy.8925@gmail.com>
Date: Wed, 17 May 2023 14:46:27 +0530
Subject: [PATCH] Fix problems with self signed SSL config - need to ensure
 cert and key file names are the same as VIRTUAL_HOST environment variable,
 and that DEFAULT_HOST needs to be specified as well

Signed-off-by: Sandeep Raghuraman <sandy.8925@gmail.com>
---
 .../with-nginx-proxy/mariadb/apache/.env             |  1 +
 .../mariadb/apache/docker-compose.yml                | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/.env

diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/.env b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/.env
new file mode 100644
index 00000000..3845eccb
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/.env
@@ -0,0 +1 @@
+VHOST=<your-server-ip-address-or-url-here>
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index b88a3594..fbfc153e 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     volumes:
       - nextcloud:/var/www/html:z
     environment:
-      - VIRTUAL_HOST=
+      - VIRTUAL_HOST=${VHOST}
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
       - MYSQL_HOST=db
@@ -63,6 +63,8 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:z,ro
     networks:
       - proxy-tier
+    environment:
+      DEFAULT_HOST=${VHOST}
 
   letsencrypt-companion:
     image: nginxproxy/acme-companion
@@ -85,11 +87,11 @@ services:
 #    volumes:
 #      - certs:/certs
 #    environment:
-#      - SSL_SUBJECT=servhostname.local
+#      - SSL_SUBJECT=${VHOST}
 #      - CA_SUBJECT=my@example.com
-#      - SSL_KEY=/certs/servhostname.local.key
-#      - SSL_CSR=/certs/servhostname.local.csr
-#      - SSL_CERT=/certs/servhostname.local.crt
+#      - SSL_KEY=/certs/${VHOST}.key
+#      - SSL_CSR=/certs/${VHOST}.csr
+#      - SSL_CERT=/certs/${VHOST}.crt
 #    networks:
 #      - proxy-tier