Use upstreamed websockify

software/kvm/common.cfg

@@ -4,7 +4,6 @@ extends =
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
-  ../../component/git/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/qemu-kvm/buildout.cfg
   ../../component/logrotate/buildout.cfg
@@ -13,13 +12,9 @@ extends =
   ../../stack/nodejs.cfg
   ../../stack/slapos.cfg
 
-develop =
-  ${:parts-directory}/websockify
-
 parts =
   template
   eggs
-  check-local-eggs
 
 #XXX-Cedric : Currently, one can only access to KVM using noVNC.
 #             Ideally one should be able to access KVM by using either NoVNC or VNC.
@@ -34,28 +29,8 @@ parts =
 
 #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
 
-[websockify]
-# XXX-Cedric : use official egg from pypi when it is released
-recipe = plone.recipe.command
-stop-on-error = true
-commit = 301f3ae580557da47fa5ea2050aa671ce9c5a1a0
-repository = https://github.com/SlapOS/websockify.git
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-git-binary = ${git:location}/bin/git
-command = export GIT_SSL_NO_VERIFY=true; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit}) || (rm -fr ${:location}; exit 1)
-update-command =
-
-[check-local-eggs]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/websockify.egg-link
-depends = ${eggs:dummy}
-
 [eggs]
 recipe = z3c.recipe.scripts
-dummy =
-  ${websockify:location}
 eggs =
   ${lxml-python:egg}
   websockify

software/kvm/software.cfg

@@ -65,6 +65,7 @@ slapos.recipe.build = 0.11.5
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.31.1
 smmap = 0.8.2
+websockify = 0.3.0
 z3c.recipe.scripts = 1.0.1
 
 # Required by: