Merge pull request #1907 from RotherOSS/issue-#1892-OTOBO_WEB_HTTPS_PORT

Issue #1892: include the HTTPS port when redirecting
RotherOSS · Sep 1, 2022 · a5a5a2e · a5a5a2e
2 parents 767658b + aceb337
commit a5a5a2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/otobo.nginx.dockerfile b/otobo.nginx.dockerfile
@@ -36,6 +36,7 @@ ENV LANG C.UTF-8
 # starting HTTP with 'docker-compose -f docker-compose.yml up'
 ENV OTOBO_NGINX_WEB_HOST          172.17.0.1
 ENV OTOBO_NGINX_WEB_PORT          5000
+ENV OTOBO_WEB_HTTPS_PORT          443
 
 # Not that these file need to be copied into a container.
 # Alternatively /etc/ssl can be exported as a volume to the host.

diff --git a/scripts/nginx/templates/otobo_nginx-kerberos.conf.template b/scripts/nginx/templates/otobo_nginx-kerberos.conf.template
@@ -21,7 +21,7 @@ server {
     server_name _;
 
     # 301 Moved Permanently, (in 'SEO-speak', it is said that the 'link-juice' is sent to the new URL).
-    return 301 https://$host$request_uri;
+    return 301 https://$host:${OTOBO_WEB_HTTPS_PORT}$request_uri;
 }
 
 # serve HTTPS
@@ -46,7 +46,7 @@ server {
     # pass on information about the client
     location / {
 
-        # Settings for useing Kerberos SSO (mostly untested)
+        # Settings for using Kerberos SSO (mostly untested)
         proxy_set_header REMOTE_USER $remote_user;
         auth_gss on;
         auth_gss_keytab /etc/krb5.keytab;

diff --git a/scripts/nginx/templates/otobo_nginx.conf.template b/scripts/nginx/templates/otobo_nginx.conf.template
@@ -21,7 +21,7 @@ server {
     server_name _;
 
     # 301 Moved Permanently, (in 'SEO-speak', it is said that the 'link-juice' is sent to the new URL).
-    return 301 https://$host$request_uri;
+    return 301 https://$host:${OTOBO_WEB_HTTPS_PORT}$request_uri;
 }
 
 # serve HTTPS