mirror of
https://github.com/OpenNebula/one.git
synced 2024-12-24 21:34:01 +03:00
0449177b85
When enabled in the occi server configuration file, UI users will be able to click the VNC icon that appears in the VM information.
Then the websockets proxy will be set up, provided that the machine has been configured with the appropiate GRAPHICS section etc. This must be done in the OCCI templates, and cannot be done by the UI user.
Wss sessions can be configured in the occi server configuration file. Unlike Sunstone, here they are transparent to the user and whenever they are enabled VNC sessions will be launched using wss:// automaticly. As such, it is not up to the user to choose the type of connection, and it fully depends on the server configuration.
Additionally the install_novnc.sh script has been updated and improved. The install.sh has been updated too.
(cherry picked from commit 4ccaf9704a)
56 lines
1.9 KiB
Bash
Executable File
56 lines
1.9 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
NOVNC_TMP=/tmp/one/novnc-$(date "+%Y%m%d%H%M%S")
|
|
PROXY_PATH=noVNC/utils/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 -C $ONE_SHARE -mxzf $NOVNC_TMP/$tar
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "Error untaring noVNC"
|
|
exit 1
|
|
fi
|
|
|
|
echo "Moving files to OpenNebula $ONE_SHARE folder..."
|
|
rm -rf $ONE_SHARE/noVNC
|
|
dir=`ls -rt $ONE_SHARE|tail -n1`
|
|
mv $ONE_SHARE/$dir $ONE_SHARE/noVNC
|
|
|
|
echo "Installing Sunstone client libraries in $ONE_PUBLIC_SUNSTONE..."
|
|
mkdir -p $ONE_PUBLIC_SUNSTONE/vendor/noVNC
|
|
cp -r $ONE_SHARE/noVNC/include/ $ONE_PUBLIC_SUNSTONE/vendor/noVNC/
|
|
|
|
echo "Installing SelfService client libraries in $ONE_PUBLIC_SELFSERVICE..."
|
|
mkdir -p $ONE_PUBLIC_SELFSERVICE/vendor/noVNC
|
|
cp -r $ONE_SHARE/noVNC/include/ $ONE_PUBLIC_SELFSERVICE/vendor/noVNC/
|
|
|
|
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" |