MP:

clecap · Oct 31, 2024 · 3b3f77b · 3b3f77b
1 parent 7e02e88
commit 3b3f77b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 215 deletions.
diff --git a/composer/docker-compose-injected.yaml b/composer/docker-compose-injected.yaml
diff --git a/images/dante-wiki/src/home/dante/dantescript/copy-out.sh b/images/dante-wiki/src/home/dante/dantescript/copy-out.sh
@@ -33,13 +33,7 @@ printf "\n\n*** copy-out.sh: copying out...\n"
   exec 1>&1 2>&2
 printf "DONE cleaning up old stuff\n"
 
-printf "\n*** copy-out.sh: Copying in index.html and favicon.ico and error404.php to /mnt ..."
-  cp /home/dante/html/index.html    /mnt
-  cp /home/dante/html/favicon.ico   /mnt
-  cp /home/dante/html/error.php     /mnt
 
-  exec 1>&1 2>&2
-printf "DONE\n"
 
 
 

diff --git a/images/dante-wiki/src/home/dante/dantescript/init.sh b/images/dante-wiki/src/home/dante/dantescript/init.sh
@@ -7,6 +7,17 @@ source /home/dante/dantescript/common-defs.sh
 printf "${GREEN}*** THIS IS /dantescript/init.sh ***** ${RESET}"
 
 
+printf "\n*** init.sh: Copying index.html, favicon.ico and error404.php to ${MOUNT}..."
+  cp /home/dante/html/index.html    ${MOUNT}
+  cp /home/dante/html/favicon.ico   ${MOUNT}
+  cp /home/dante/html/error.php     ${MOUNT}
+  exec 1>&1 2>&2
+printf "DONE\n"
+
+
+
+
+
 # check if we already have a LocalSettings.php
 if [ -e "${MOUNT}/${TARGET}/LocalSettings.php" ]; then
   printf "${GREEN} *** init.sh finds the system already in initialized state - exiting init.sh\n"

diff --git a/images/dante-wiki/src/home/dante/html/README.md b/images/dante-wiki/src/home/dante/html/README.md
@@ -1,6 +1,6 @@
 
 
-index.html      Provides a generic homepage / index page for a smooth entry, in case the suer only typed the short form of the URL.
+index.html      Provides a generic redirect.
 error404.php   Provides an error page which also mentions the URL which was not found. This is needed for some forms of debugging.
 
 
diff --git a/images/dante-wiki/src/home/dante/html/index.html b/images/dante-wiki/src/home/dante/html/index.html
@@ -1,20 +1,13 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
-<style>
-* {font-family:sans-serif;font-size:18pt;}
-a {
-  text-decoration: none;
-}
-</style>
-
+  <meta charset="UTF-8">
+  <meta http-equiv="refresh" content="0;url=wiki-dir/index.php">
+  <title>Redirecting...</title>
 </head>
-
 <body>
-
-<ul>
-<li><a href="http://localhost:8080/wiki-dir/">wiki-dir via HTTP on http://localhost:8080/wiki-dir</a></li>
-<li><a href="https://localhost:4443/wiki-dir/">wiki-dir via HTTP<b style="color:red;">S</b> on https://localhost:4443/wiki-dir</a></li>
-</ul>
-
+<script>
+    window.location.href = "wiki-dir/index.php";
+  </script>
 </body>
 </html>