|
|
@ -1171,6 +1171,7 @@ sub DefineFilePathsAndStuff {
|
|
|
|
|
|
|
|
|
|
|
|
$KasmVNC::Users::vncPasswdBin = $exedir . "kasmvncpasswd";
|
|
|
|
$KasmVNC::Users::vncPasswdBin = $exedir . "kasmvncpasswd";
|
|
|
|
$KasmVNC::Users::logger = $logger;
|
|
|
|
$KasmVNC::Users::logger = $logger;
|
|
|
|
|
|
|
|
$KasmVNC::Config::logger = $logger;
|
|
|
|
|
|
|
|
|
|
|
|
$vncSystemConfigDir = "/etc/kasmvnc";
|
|
|
|
$vncSystemConfigDir = "/etc/kasmvnc";
|
|
|
|
if ($ENV{KASMVNC_DEVELOPMENT}) {
|
|
|
|
if ($ENV{KASMVNC_DEVELOPMENT}) {
|
|
|
@ -1979,7 +1980,7 @@ sub DefineConfigToCLIConversion {
|
|
|
|
$self = shift;
|
|
|
|
$self = shift;
|
|
|
|
|
|
|
|
|
|
|
|
my @values = @{ listify($self->configValues()) };
|
|
|
|
my @values = @{ listify($self->configValues()) };
|
|
|
|
|
|
|
|
|
|
|
|
my $valuesStr = "";
|
|
|
|
my $valuesStr = "";
|
|
|
|
foreach $value (@values) {
|
|
|
|
foreach $value (@values) {
|
|
|
|
$valuesStr = $valuesStr . "-http-header '$value' "
|
|
|
|
$valuesStr = $valuesStr . "-http-header '$value' "
|
|
|
@ -2754,5 +2755,6 @@ sub SetAppSettingsFromConfigAndCli {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
sub InitLogger {
|
|
|
|
sub InitLogger {
|
|
|
|
$logger = KasmVNC::Logger->new();
|
|
|
|
my $debugEnabled = any { $_ eq "-debug" } @ARGV;
|
|
|
|
|
|
|
|
$logger = KasmVNC::Logger->new({ level => $debugEnabled ? "debug" : "warn" });
|
|
|
|
}
|
|
|
|
}
|
|
|
|