Internal webserver

Internal webserver

run/install.sh

@@ -2,7 +2,6 @@
 set -Eeuo pipefail
 
 # Display wait message
-/run/server.sh 80 install &
 /run/server.sh 5000 install &
 
 # Download the required files from the Synology website

run/network.sh

@@ -199,9 +199,8 @@ if [[ "${DHCP}" == [Yy1]* ]]; then
   # Configuration for DHCP IP
   configureDHCP
 
+  # Display IP on port 80 and 5000
   { pkill -f server.sh || true; } 2>/dev/null
-
-  /run/server.sh 80 /run/ip.sh &
   /run/server.sh 5000 /run/ip.sh &
 
 else

run/server.sh

@@ -33,15 +33,18 @@ if [[ "$2" != "/"* ]]; then
   HTML=$(html "$BODY")
   printf '%b' "HTTP/1.1 200 OK\nContent-Length: ${#HTML}\nConnection: close\n\n$HTML" > "$TMP_FILE"
 
+  socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null &
   socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null & wait $!
   
-else
+  exit
   
-  if [[ "$2" != "/run/ip.sh" ]]; then
+fi
+
+if [[ "$2" != "/run/ip.sh" ]]; then
 
   cp "$2" "$TMP_FILE"
 
-  else
+else
 
   BODY="The location of DSM is <a href='http://\${IP}:\${PORT}'>http://\${IP}:\${PORT}</a><script>"
   BODY="${BODY}setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);</script>"
@@ -57,9 +60,9 @@ else
     echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
   } > "$TMP_FILE"
 
-  fi
-
-  chmod +x "$TMP_FILE"
-  socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null & wait $!
-
 fi
+
+chmod +x "$TMP_FILE"
+  
+socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null &
+socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null & wait $!