burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed use of Spice over OpenNebula

Browse Source 
* Minor cosmetic fixes :)
This commit is contained in:
Adolfo Gómez García 2017-02-21 14:51:25 +01:00
parent 8ee34cd42b
commit a83e218679
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/uds/core/util/unique.py
View File

@ -34,6 +34,6 @@ from __future__ import unicode_literals
# Helper to acommodate all unique generators in one place # Helper to acommodate all unique generators in one place
from .UniqueGIDGenerator import UniqueGIDGenerator from .UniqueGIDGenerator import UniqueGIDGenerator # @UnusedImport
from .UniqueMacGenerator import UniqueMacGenerator from .UniqueMacGenerator import UniqueMacGenerator # @UnusedImport
from .UniqueNameGenerator import UniqueNameGenerator from .UniqueNameGenerator import UniqueNameGenerator # @UnusedImport

4
server/src/uds/transports/SPICE/BaseSPICETransport.py
View File

@ -44,7 +44,7 @@ from uds.services.OVirt.OVirtProvider import Provider as oVirtProvider
import logging import logging
import os import os
__updated__ = '2016-05-27' __updated__ = '2017-02-21'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -85,7 +85,7 @@ class BaseSpiceTransport(Transport):
multiline=4, multiline=4,
label=_('Certificate'), label=_('Certificate'),
tooltip=_('Server certificate (public), can be found on your ovirt engine, probably at /etc/pki/ovirt-engine/certs/ca.der (Use the contents of this file).'), tooltip=_('Server certificate (public), can be found on your ovirt engine, probably at /etc/pki/ovirt-engine/certs/ca.der (Use the contents of this file).'),
required=True required=False
) )
fullScreen = gui.CheckBoxField( fullScreen = gui.CheckBoxField(
order=5, order=5,

9
server/src/uds/transports/SPICE/RemoteViewerFile.py
View File

@ -8,7 +8,7 @@ import six
import os import os
__updated__ = '2016-05-27' __updated__ = '2017-02-21'
TEMPLATE = '''[virt-viewer] TEMPLATE = '''[virt-viewer]
@ -29,7 +29,7 @@ ca={ca}
toggle-fullscreen=shift+f11 toggle-fullscreen=shift+f11
release-cursor=shift+f12 release-cursor=shift+f12
secure-attention=ctrl+alt+end secure-attention=ctrl+alt+end
secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard {secure_channel}
''' '''
@ -81,6 +81,7 @@ class RemoteViewerFile(object):
smartcard=smartcard, smartcard=smartcard,
usb_auto_share=usb_auto_share, usb_auto_share=usb_auto_share,
delete_file=delete_file, delete_file=delete_file,
host_subject=self.host_subject, host_subject=self.host_subject if self.tls_port != -1 else '',
ca=ca ca=ca if self.tls_port != -1 else '',
secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard' if self.tls_port != -1 else ''
) )