From 9f54c236299e988fa166c2b8b129319463fda542 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Thu, 17 May 2012 13:48:42 -0300 Subject: [PATCH 1/2] Remove old flagfile support default_flagfile has been removed from the nova trunk in favour of .ini files (https://github.com/openstack/nova/commit/7e3e9b8e9cea4f1bf78d127ffb915b79c854fdbe) --- utils/nova-novncproxy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy index a6fce14b..a920492d 100755 --- a/utils/nova-novncproxy +++ b/utils/nova-novncproxy @@ -132,7 +132,7 @@ if __name__ == '__main__': parser.error("SSL only and %s not found" % FLAGS.cert) # Setup flags - utils.default_flagfile() + utils.default_cfgfile() FLAGS(sys.argv) # Create and start the NovaWebSockets proxy From ab44059b8b3c545b00beab7547195e51cedac6a4 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Thu, 24 May 2012 07:08:45 -0500 Subject: [PATCH 2/2] README: Add PocketVNC. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b5f43527..8bfeb317 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Notable commits, announcements and news are posted to @noVNC There are many companies/projects that have integrated noVNC into -their products including: [Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr), [Archipel](http://archipelproject.org), [openQRM](http://www.openqrm.com/), [OpenNode](http://www.opennodecloud.com/), [OpenStack](http://www.openstack.org), [Broadway (HTML5 GDK/GTK+ backend)](http://blogs.gnome.org/alexl/2011/03/15/gtk-html-backend-update/), [OpenNebula](http://opennebula.org/), [CloudSigma](http://www.cloudsigma.com/), [Zentyal (formerly eBox)](http://www.zentyal.org/), [SlapOS](http://www.slapos.org), [Intel MeshCentral](https://meshcentral.com), [Amahi](http://amahi.org), [Brightbox](http://brightbox.com/), [Foreman](http://theforeman.org) and [LibVNCServer](http://libvncserver.sourceforge.net). See [this wiki page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC) for more info and links. +their products including: [Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr), [Archipel](http://archipelproject.org), [openQRM](http://www.openqrm.com/), [OpenNode](http://www.opennodecloud.com/), [OpenStack](http://www.openstack.org), [Broadway (HTML5 GDK/GTK+ backend)](http://blogs.gnome.org/alexl/2011/03/15/gtk-html-backend-update/), [OpenNebula](http://opennebula.org/), [CloudSigma](http://www.cloudsigma.com/), [Zentyal (formerly eBox)](http://www.zentyal.org/), [SlapOS](http://www.slapos.org), [Intel MeshCentral](https://meshcentral.com), [Amahi](http://amahi.org), [Brightbox](http://brightbox.com/), [Foreman](http://theforeman.org), [LibVNCServer](http://libvncserver.sourceforge.net) and [PocketVNC](http://www.pocketvnc.com/blog/?page_id=866). See [this wiki page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC) for more info and links. ### Features @@ -56,7 +56,8 @@ See more screenshots h ### Server Requirements Unless you are using a VNC server with support for WebSockets -connections (such as [x11vnc/libvncserver](http://libvncserver.sourceforge.net/)), +connections (such as [x11vnc/libvncserver](http://libvncserver.sourceforge.net/) or +[PocketVNC](http://www.pocketvnc.com/blog/?page_id=866)), you need to use a WebSockets to TCP socket proxy. There is a python proxy included ('websockify').