[pve-devel] [PATCH manager 2/5] add xtermjs to pveproxy dirs

[Thomas Lamprecht]

On 12/01/2017 09:29 AM, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  PVE/Service/pveproxy.pm | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
> index 7d39900a..ec1eb9a5 100755
> --- a/PVE/Service/pveproxy.pm
> +++ b/PVE/Service/pveproxy.pm
> @@ -51,6 +51,7 @@ my $basedirs = {
>      manager => '/usr/share/pve-manager',
>      docs => '/usr/share/pve-docs',
>      fontawesome => '/usr/share/fonts-font-awesome',
> +    xtermjs => '/usr/share/pve-xtermjs',
>  };
>  
>  sub init {
> @@ -79,6 +80,7 @@ sub init {
>      add_dirs($dirs, '/pve2/fa/css/' =>  "$basedirs->{fontawesome}/css/");
>      add_dirs($dirs, '/pve-docs/' => "$basedirs->{docs}/");
>      add_dirs($dirs, '/novnc/' => "$basedirs->{novnc}/");
> +    add_dirs($dirs, '/xtermjs/' => "$basedirs->{xtermjs}/");
>  
>      $self->{server_config} = {
>  	title => 'Proxmox VE API',
> @@ -192,6 +194,9 @@ sub get_index {
>  	$mobile = $args->{mobile} ? 1 : 0;
>      }
>  
> +    my $novnc = defined($args->{console}) && $args->{novnc};
> +    my $xtermjs = defined($args->{console}) && $args->{xtermjs};
> +
>      my $page = '';
>      my $template = Template->new({ABSOLUTE => 1});
>  
> @@ -218,8 +223,10 @@ sub get_index {
>      # by default, load the normal index
>      my $dir = $basedirs->{manager};
>  
> -    if (defined($args->{console}) && $args->{novnc}) {
> +    if ($novnc) {
>  	$dir = $basedirs->{novnc};
> +    } elsif ($xtermjs) {
> +	$dir = $basedirs->{xtermjs};
>      } elsif ($mobile) {
>  	$dir = "$basedirs->{manager}/touch";
>      }
> 

Reviewed-by: Thomas Lamprecht <t.lamprecht at proxmox.com>