Adding --key option

slapos/recipe/kvm/__init__.py

@@ -165,7 +165,7 @@ class Recipe(BaseSlapRecipe):
     noVNC_conf['python_path']      = python_path
 
     noVNC_conf['ca_conf']          = self.installCertificateAuthority()
-    key, noVNC_conf['certificate_path'] = self.requestCertificate('noVNC')
+    noVNC_conf['key_path'], noVNC_conf['certificate_path'] = self.requestCertificate('noVNC')
 
     # Instanciate Websockify
     websockify_runner_path = self.instanciate_wrapper("websockify",

slapos/recipe/kvm/certificate_authority.py

@@ -43,7 +43,7 @@ class CertificateAuthority:
       # no CA, let us create new one
       popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
           self.openssl_configuration, '-new', '-x509', '-extensions',
-          'v3_ca', '-keyout', self.certificate, '-out', self.certificate,
+          'v3_ca', '-keyout', self.key, '-out', self.certificate,
           '-days', '10950'], 'Automatic Certificate Authority\n')
     except:
       try:

slapos/recipe/kvm/template/websockify_run.in

@@ -2,5 +2,5 @@
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
 
-%(python_path)s %(websockify_path)s --web %(noVNC_location)s --cert=%(certificate_path)s --ssl-only %(source_ip)s:%(source_port)s %(target_ip)s:%(target_port)s
+%(python_path)s %(websockify_path)s --web %(noVNC_location)s --key=%(key_path)s --cert=%(certificate_path)s --ssl-only %(source_ip)s:%(source_port)s %(target_ip)s:%(target_port)s