Manually handle TERM signal for websockify.

software/kvm/instance-kvm.cfg

@@ -9,6 +9,7 @@ parts =
   publish-kvm-backend-connection-information
   publish-kvm-frontend-connection-information
   kvm-promise
+  websockify-sighandler
   novnc-promise
   frontend-promise
 
@@ -80,6 +81,11 @@ websockify-path = ${buildout:directory}/bin/websockify
 ssl-key-path = $${ca-novnc:key-file}
 ssl-cert-path = $${ca-novnc:cert-file}
 
+[websockify-sighandler]
+recipe = slapos.cookbook:signalwrapper
+wrapper-path = $${basedirectory:services}/websockify
+wrapped-path = $${novnc-instance:path}
+
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${openssl:location}/bin/openssl
@@ -105,7 +111,7 @@ recipe = slapos.cookbook:certificate_authority.request
 key-file = $${basedirectory:novnc-conf}/novnc.key
 cert-file = $${basedirectory:novnc-conf}/novnc.crt
 executable = $${rootdirectory:bin}/novnc
-wrapper = $${basedirectory:services}/websockify
+wrapper = $${rootdirectory:bin}/websockify
 
 [novnc-promise]
 recipe = slapos.cookbook:check_port_listening