From 40d8af038558e27e8c6f425784db7c2c84b1868b Mon Sep 17 00:00:00 2001
From: Jlopez <jonathanlopez@hotmail.ca>
Date: Tue, 9 Jul 2024 17:39:47 -0400
Subject: [PATCH] last try at removing port redirect

---
 wiki/Dockerfile | 2 +-
 wiki/nginx.conf | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wiki/Dockerfile b/wiki/Dockerfile
index 36263d4..beb2128 100644
--- a/wiki/Dockerfile
+++ b/wiki/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdocs build -f mkdocs-fr.yml -d site/fr
 
 RUN mkdocs build -f mkdocs-en.yml -d site/en
 
-FROM ghcr.io/nginxinc/nginx-unprivileged:stable-alpine
+FROM ghcr.io/nginxinc/nginx-unprivileged:stable-bookworm-perl
 
 COPY --from=builder /app/site/fr /usr/share/nginx/html/
 COPY --from=builder /app/site/en /usr/share/nginx/html/en/
diff --git a/wiki/nginx.conf b/wiki/nginx.conf
index 8fe369b..522ab6c 100644
--- a/wiki/nginx.conf
+++ b/wiki/nginx.conf
@@ -36,11 +36,12 @@ http {
     server {
         listen 8080;
         server_name _;
+        	
+        absolute_redirect off;
 
         location / {
             alias /usr/share/nginx/html/fr/;
             try_files $uri $uri/ /fr/index.html;
-            error_page 404 /404.html;
         }
 
         location /en/ {
@@ -48,5 +49,9 @@ http {
             try_files $uri $uri/ /en/index.html;
             error_page 404 /en/404.html;
         }
+
+        location ~ ^(.+)/$ { return 301 $scheme://$http_host$1; }
+
+        error_page 404 /404.html;
     }
 }