Reverting

slapos/recipe/kvm/__init__.py

@@ -232,7 +232,7 @@ class Recipe(BaseSlapRecipe):
     self.ca_crl = os.path.join(self.ca_dir, 'crl')
     self.ca_newcerts = os.path.join(self.ca_dir, 'newcerts')
     self.ca_key_ext = '.key'
-    self.ca_crt_ext = '.pem'
+    self.ca_crt_ext = '.crt'
     for d in [self.ca_private, self.ca_crl, self.ca_newcerts, self.ca_certs]:
       self._createDirectory(d)
     for f in ['crlnumber', 'serial']:

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 --cert=%(certificate_path)s %(source_ip)s:%(source_port)s %(target_ip)s:%(target_port)s