From 8de31c8ea036e386fd4a9073174bd84d9eef7b3b Mon Sep 17 00:00:00 2001
From: BNOPOD <b23prodtm@users.sourceforge.net>
Date: Sun, 21 Feb 2021 21:58:02 +0100
Subject: [PATCH] .

---
 Dockerfile.armhf         | 4 ++++
 Dockerfile.template      | 4 ++++
 Dockerfile.x86_64        | 4 ++++
 etc/apache2/ssl_site.tpl | 6 +++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index ffd4c023..ea49807a 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -59,6 +59,10 @@ ENV PGID ${PGID:-0}
 # Must own the ip address
 ARG HTTPD_LISTEN
 ENV HTTPD_LISTEN ${HTTPD_LISTEN:-'*:80'}
+ARG SSL_PORT
+ENV SSL_PORT ${SSL_PORT:-'443'}
+ARG HTTPD_LISTEN_SSL
+ENV HTTPD_LISTEN_SSL ${HTTPD_LISTEN_SSL:-'*:443'}
 # Enable migrate-database.sh options
 ARG MIGRATE_OPTION
 ENV MIGRATE_OPTION ${MIGRATE_OPTION:-'-v'}
diff --git a/Dockerfile.template b/Dockerfile.template
index d08c628d..bb4feec3 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -59,6 +59,10 @@ ENV PGID ${PGID:-0}
 # Must own the ip address
 ARG HTTPD_LISTEN
 ENV HTTPD_LISTEN ${HTTPD_LISTEN:-'*:80'}
+ARG SSL_PORT
+ENV SSL_PORT ${SSL_PORT:-'443'}
+ARG HTTPD_LISTEN_SSL
+ENV HTTPD_LISTEN_SSL ${HTTPD_LISTEN_SSL:-'*:443'}
 # Enable migrate-database.sh options
 ARG MIGRATE_OPTION
 ENV MIGRATE_OPTION ${MIGRATE_OPTION:-'-v'}
diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index f0f344c4..12a7e990 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -59,6 +59,10 @@ ENV PGID ${PGID:-0}
 # Must own the ip address
 ARG HTTPD_LISTEN
 ENV HTTPD_LISTEN ${HTTPD_LISTEN:-'*:80'}
+ARG SSL_PORT
+ENV SSL_PORT ${SSL_PORT:-'443'}
+ARG HTTPD_LISTEN_SSL
+ENV HTTPD_LISTEN_SSL ${HTTPD_LISTEN_SSL:-'*:443'}
 # Enable migrate-database.sh options
 ARG MIGRATE_OPTION
 ENV MIGRATE_OPTION ${MIGRATE_OPTION:-'-v'}
diff --git a/etc/apache2/ssl_site.tpl b/etc/apache2/ssl_site.tpl
index bfbd50c2..0923d5d6 100644
--- a/etc/apache2/ssl_site.tpl
+++ b/etc/apache2/ssl_site.tpl
@@ -1,8 +1,8 @@
-<VirtualHost ${HTTPD_LISTEN/:80/:443}>
+<VirtualHost ${HTTPD_LISTEN_SSL}>
     DocumentRoot ${WWW}
     ServerAdmin webmaster@${SERVER_NAME}
-    ServerName ${SERVER_NAME}:443
-    ServerAlias www.${SERVER_NAME}:443
+    ServerName ${SERVER_NAME}:${SSL_PORT}
+    ServerAlias www.${SERVER_NAME}:${SSL_PORT}
     <Directory \"${WWW}\">
         DirectoryIndex index.php
         Options +FollowSymLinks