From 45e3b00180fa917766a587e7b4197d953c6c569b Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 11 Sep 2020 15:56:11 +0300 Subject: [PATCH] add getvvfile for desktop viewers.(virt-viewer) --- instances/templates/instances/access_tab.html | 3 +++ instances/views.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/instances/templates/instances/access_tab.html b/instances/templates/instances/access_tab.html index b32046e..56ac296 100644 --- a/instances/templates/instances/access_tab.html +++ b/instances/templates/instances/access_tab.html @@ -156,6 +156,9 @@ {% trans "VDI" %} +

{% trans "To download console.vv file for virt-viewer." %}

+ {% trans "Get console.vv" %} +
{% endif %} diff --git a/instances/views.py b/instances/views.py index bf74f62..f3f92e8 100644 --- a/instances/views.py +++ b/instances/views.py @@ -1164,7 +1164,10 @@ def getvvfile(request, pk): response = HttpResponse(content='', content_type='application/x-virt-viewer', status=200, reason=None, charset='utf-8') response.writelines('[virt-viewer]\n') response.writelines('type=' + conn.graphics_type(instance.name) + '\n') - response.writelines('host=' + conn.graphics_listen(instance.name) + '\n') + if conn.graphics_listen(instance.name) == '0.0.0.0': + response.writelines('host=' + conn.host + '\n') + else: + response.writelines('host=' + conn.graphics_listen(instance.name) + '\n') response.writelines('port=' + conn.graphics_port(instance.name) + '\n') response.writelines('title=' + conn.domain_name(instance.name) + '\n') response.writelines('password=' + conn.graphics_passwd(instance.name) + '\n')