.

b23prodtm · Feb 21, 2021 · 8de31c8 · 8de31c8
1 parent 3bddfeb
commit 8de31c8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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