mirror of
https://github.com/OpenNebula/one.git
synced 2025-02-23 21:57:43 +03:00
7b184d6c43
Taking advantage of latest developments contributed to websockify, we can now make use of multiples targets validated by a system of file-based tokens. The stopvnc actions dissapear as we only have to close the connection. The proxy is launched at the start of Sunstone and shutdown and the end. The tokens which allow to set up the proxied connections expire after 4 seconds. Necessary modifications have been made in Sunstone and SelfService. novnc install script has been modified to fetch the websockify proxy files from the original project. Also, only the strictly necessary files for novnc+websockify to run are now installed. (cherry picked from commit 89631ebdb4c8a5368924cc04ddea0ebf955d75c5)
71 lines
2.3 KiB
Bash
Executable File
71 lines
2.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
NOVNC_TMP=/tmp/one/novnc-$(date "+%Y%m%d%H%M%S")
|
|
PROXY_PATH=websockify/websockify
|
|
|
|
if [ -z "$ONE_LOCATION" ]; then
|
|
ONE_SHARE=/usr/share/one
|
|
ONE_PUBLIC_SUNSTONE=/usr/lib/one/sunstone/public
|
|
SUNSTONE_CONF=/etc/one/sunstone-server.conf
|
|
ONE_PUBLIC_SELFSERVICE=/usr/lib/one/ruby/cloud/occi/ui/public
|
|
SELFSERVICE_CONF=/etc/one/occi-server.conf
|
|
else
|
|
ONE_SHARE=$ONE_LOCATION/share
|
|
ONE_PUBLIC_SUNSTONE=$ONE_LOCATION/lib/sunstone/public
|
|
SUNSTONE_CONF=$ONE_LOCATION/etc/sunstone-server.conf
|
|
ONE_PUBLIC_SELFSERVICE=$ONE_LOCATION/lib/ruby/cloud/occi/ui/public
|
|
SELFSERVICE_CONF=$ONE_LOCATION/etc/occi-server.conf
|
|
fi
|
|
|
|
echo "Downloading noVNC latest version..."
|
|
mkdir -p $NOVNC_TMP
|
|
cd $NOVNC_TMP
|
|
curl -O -# -L http://github.com/kanaka/noVNC/tarball/master
|
|
if [ $? -ne 0 ]; then
|
|
echo "\nError downloading noVNC"
|
|
exit 1
|
|
fi
|
|
|
|
echo "Extracting files to temporary folder..."
|
|
tar=`ls -rt $NOVNC_TMP|tail -n1`
|
|
tar -mxzf $NOVNC_TMP/$tar
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "Error untaring noVNC"
|
|
exit 1
|
|
fi
|
|
|
|
echo "Installing Sunstone client libraries in $ONE_PUBLIC_SUNSTONE..."
|
|
rm -rf $ONE_PUBLIC_SUNSTONE/vendor/noVNC/
|
|
mkdir -p $ONE_PUBLIC_SUNSTONE/vendor/noVNC
|
|
cp -r $NOVNC_TMP/*noVNC*/include/ $ONE_PUBLIC_SUNSTONE/vendor/noVNC/
|
|
|
|
echo "Installing SelfService client libraries in $ONE_PUBLIC_SELFSERVICE..."
|
|
rm -rf $ONE_PUBLIC_SELFSERVICE/vendor/noVNC/
|
|
mkdir -p $ONE_PUBLIC_SELFSERVICE/vendor/noVNC
|
|
cp -r $NOVNC_TMP/*noVNC*/include/ $ONE_PUBLIC_SELFSERVICE/vendor/noVNC/
|
|
|
|
cd $ONE_SHARE
|
|
rm -rf $NOVNC_TMP
|
|
|
|
echo "Downloading Websockify VNC proxy files"
|
|
rm -rf $ONE_SHARE/websockify
|
|
mkdir -p $ONE_SHARE/websockify
|
|
cd $ONE_SHARE/websockify
|
|
curl -O -# -L https://raw.github.com/kanaka/websockify/master/websockify
|
|
if [ $? -ne 0 ]; then
|
|
echo "\nError downloading websockify"
|
|
exit 1
|
|
fi
|
|
curl -O -# -L https://raw.github.com/kanaka/websockify/master/websocket.py
|
|
if [ $? -ne 0 ]; then
|
|
echo "\nError downloading websocket.py"
|
|
exit 1
|
|
fi
|
|
|
|
echo "Backing up and updating $SUNSTONE_CONF with new VNC proxy path..."
|
|
sed -i.bck "s%^\(:vnc_proxy_path:\).*$%\1 $ONE_SHARE/$PROXY_PATH%" $SUNSTONE_CONF
|
|
echo "Backing up and updating $SELFSERVICE_CONF with new VNC proxy path..."
|
|
sed -i.bck "s%^\(:vnc_proxy_path:\).*$%\1 $ONE_SHARE/$PROXY_PATH%" $SELFSERVICE_CONF
|
|
|
|
echo "Installation successful" |