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

specify basedirs instead of hardcoding them several times

Browse Source 
using a hash with the directories makes it easier to reuse them

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-03-07 11:18:20 +01:00 committed by Dietmar Maurer
parent e890b92d67
commit 245e567e62
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/Service/pveproxy.pm
View File

@ -46,6 +46,14 @@ sub add_dirs {
PVE::APIServer::AnyEvent::add_dirs($result_hash, $alias, $subdir); PVE::APIServer::AnyEvent::add_dirs($result_hash, $alias, $subdir);
} }
my $basedirs = {
novnc => '/usr/share/novnc-pve',
extjs => '/usr/share/javascript/extjs',
manager => '/usr/share/pve-manager',
docs => '/usr/share/pve-docs',
vncterm => '/usr/share/vncterm',
};
sub init { sub init {
my ($self) = @_; my ($self) = @_;
@ -62,15 +70,15 @@ sub init {
my $dirs = {}; my $dirs = {};
add_dirs($dirs, '/pve2/locale/', '/usr/share/pve-manager/locale/'); add_dirs($dirs, '/pve2/locale/', "$basedirs->{manager}/locale/");
add_dirs($dirs, '/pve2/touch/', '/usr/share/pve-manager/touch/'); add_dirs($dirs, '/pve2/touch/', "$basedirs->{manager}/touch/");
add_dirs($dirs, '/pve2/ext6/', '/usr/share/javascript/extjs/'); add_dirs($dirs, '/pve2/ext6/', "$basedirs->{extjs}/");
add_dirs($dirs, '/pve2/images/' => '/usr/share/pve-manager/images/'); add_dirs($dirs, '/pve2/images/' => "$basedirs->{manager}/images/");
add_dirs($dirs, '/pve2/css/' => '/usr/share/pve-manager/css/'); add_dirs($dirs, '/pve2/css/' => "$basedirs->{manager}/css/");
add_dirs($dirs, '/pve2/js/' => '/usr/share/pve-manager/js/'); add_dirs($dirs, '/pve2/js/' => "$basedirs->{manager}/js/");
add_dirs($dirs, '/pve-docs/' => '/usr/share/pve-docs/'); add_dirs($dirs, '/pve-docs/' => "$basedirs->{docs}/");
add_dirs($dirs, '/vncterm/' => '/usr/share/vncterm/'); add_dirs($dirs, '/vncterm/' => "$basedirs->{vncterm}/");
add_dirs($dirs, '/novnc/' => '/usr/share/novnc-pve/'); add_dirs($dirs, '/novnc/' => "$basedirs->{novnc}/");
$self->{server_config} = { $self->{server_config} = {
title => 'Proxmox VE API', title => 'Proxmox VE API',
@ -101,7 +109,7 @@ sub init {
'/' => sub { get_index($self->{nodename}, @_) }, '/' => sub { get_index($self->{nodename}, @_) },
# avoid authentication when accessing favicon # avoid authentication when accessing favicon
'/favicon.ico' => { '/favicon.ico' => {
file => '/usr/share/pve-manager/images/favicon.ico', file => "$basedirs->{manager}/images/favicon.ico",
}, },
}, },
dirs => $dirs, dirs => $dirs,