Merge branch 'main' into dev

deploy/df-wiki/templates/configmap-nginx-conf.yaml

@@ -8,7 +8,7 @@ data:
         listen 8080;
         server_name localhost;
         port_in_redirect off;
-        location /wiki/ {
+        location /wiki {
             alias /etc/nginx/html/;
             index index.html index.htm;
             try_files $uri $uri/ $uri/index.html /index.html =404;