Unverified Commit a37db1b0 authored by Haozhe Xie's avatar Haozhe Xie Committed by GitHub
Browse files

fix: Use relative paths for noVNC

parent 771cecde

Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ RUN set -eu && \ 
    tar -xf /tmp/novnc.tar.gz -C /tmp/ && \

    cd "/tmp/noVNC-${VERSION_VNC}" && \

    mv app core vendor package.json *.html /usr/share/novnc && \

    sed -i "s|UI\.initSetting('path', 'websockify')|UI.initSetting('path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify')|" /usr/share/novnc/app/ui.js && \

    unlink /etc/nginx/sites-enabled/default && \

    sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf && \

    echo "$VERSION_ARG" > /run/version && \

web/index.html

+3 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
        [1]

        <meta http-equiv="Cache-Control" content="no-cache" />

        <meta name="viewport" content="width=device-width, initial-scale=1.0" />

        <link rel="stylesheet" type="text/css" href="/css/style.css" />

        <link rel="icon" href="/img/favicon.svg" type="image/x-icon">

        <link rel="stylesheet" type="text/css" href="css/style.css" />

        <link rel="icon" href="img/favicon.svg" type="image/x-icon">

        [2]

    </head>
@@ -28,7 +28,7 @@ 
                [5]

            </footer>

        </div>

        <script type="text/javascript" src="/js/script.js"></script>

        <script type="text/javascript" src="js/script.js"></script>

    </body>



</html>

web/js/script.js

+7 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ var webSocketFactory = { 


function getInfo() {



    var url = "/msg.html";

    var url = "msg.html";



    try {

        if (window.XMLHttpRequest) {
@@ -69,7 +69,12 @@ function processInfo() { 


        if (notFound) {

            setInfo("Connecting to VNC", true);

            var webSocket = webSocketFactory.connect("ws://" + window.location.host + "/websockify");



            var protocol = window.location.protocol === "https:" ? "wss:" : "ws:";

            var path = window.location.pathname.replace(/[^/]*$/, '').replace(/\/$/, '');

            var wsUrl = protocol + "//" + window.location.host + path + "/websockify";

            var webSocket = webSocketFactory.connect(wsUrl);

    

            return true;

        }

web/nginx.conf

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ server { 
      index vnc.html;



      if ($request_uri = "/") {

        return 301 /?resize=scale&reconnect=true&autoconnect=true;

        return 301 ?resize=scale&reconnect=true&autoconnect=true;

      }



    }