proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 08:26:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add xtermjs to pveproxy dirs

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-12-11 14:55:27 +01:00 committed by Wolfgang Bumiller
parent 4b168c2772
commit 03f09f9ab0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Service/pveproxy.pm
View File

@ -51,6 +51,7 @@ my $basedirs = {
manager => '/usr/share/pve-manager', manager => '/usr/share/pve-manager',
docs => '/usr/share/pve-docs', docs => '/usr/share/pve-docs',
fontawesome => '/usr/share/fonts-font-awesome', fontawesome => '/usr/share/fonts-font-awesome',
xtermjs => '/usr/share/pve-xtermjs',
}; };
sub init { sub init {
@ -79,6 +80,7 @@ sub init {
add_dirs($dirs, '/pve2/fa/css/' => "$basedirs->{fontawesome}/css/"); add_dirs($dirs, '/pve2/fa/css/' => "$basedirs->{fontawesome}/css/");
add_dirs($dirs, '/pve-docs/' => "$basedirs->{docs}/"); add_dirs($dirs, '/pve-docs/' => "$basedirs->{docs}/");
add_dirs($dirs, '/novnc/' => "$basedirs->{novnc}/"); add_dirs($dirs, '/novnc/' => "$basedirs->{novnc}/");
add_dirs($dirs, '/xtermjs/' => "$basedirs->{xtermjs}/");
$self->{server_config} = { $self->{server_config} = {
title => 'Proxmox VE API', title => 'Proxmox VE API',
@ -192,6 +194,9 @@ sub get_index {
$mobile = $args->{mobile} ? 1 : 0; $mobile = $args->{mobile} ? 1 : 0;
} }
my $novnc = defined($args->{console}) && $args->{novnc};
my $xtermjs = defined($args->{console}) && $args->{xtermjs};
my $page = ''; my $page = '';
my $template = Template->new({ABSOLUTE => 1}); my $template = Template->new({ABSOLUTE => 1});
@ -218,8 +223,10 @@ sub get_index {
# by default, load the normal index # by default, load the normal index
my $dir = $basedirs->{manager}; my $dir = $basedirs->{manager};
if (defined($args->{console}) && $args->{novnc}) { if ($novnc) {
$dir = $basedirs->{novnc}; $dir = $basedirs->{novnc};
} elsif ($xtermjs) {
$dir = $basedirs->{xtermjs};
} elsif ($mobile) { } elsif ($mobile) {
$dir = "$basedirs->{manager}/touch"; $dir = "$basedirs->{manager}/touch";
} }