mirror of
https://github.com/kasmtech/KasmVNC.git
synced 2025-02-16 18:31:50 +01:00
Merge branch 'feature/KASM-4796-add-unix-relay-to-config' into 'master'
Add network.unix_relay to yaml config Closes KASM-4796 See merge request kasm-technologies/internal/KasmVNC!108
This commit is contained in:
commit
04f95d2b62
@ -35,7 +35,7 @@ sub new {
|
|||||||
},
|
},
|
||||||
toStringSub => $args->{toStringSub} || sub {
|
toStringSub => $args->{toStringSub} || sub {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
|
|
||||||
my $derivedValue = $self->deriveValue();
|
my $derivedValue = $self->deriveValue();
|
||||||
if (defined($derivedValue)) {
|
if (defined($derivedValue)) {
|
||||||
return "-$self->{name} " . "'$derivedValue'";
|
return "-$self->{name} " . "'$derivedValue'";
|
||||||
|
@ -23,6 +23,9 @@ network:
|
|||||||
pem_certificate: /etc/ssl/certs/ssl-cert-snakeoil.pem
|
pem_certificate: /etc/ssl/certs/ssl-cert-snakeoil.pem
|
||||||
pem_key: /etc/ssl/private/ssl-cert-snakeoil.key
|
pem_key: /etc/ssl/private/ssl-cert-snakeoil.key
|
||||||
require_ssl: true
|
require_ssl: true
|
||||||
|
# unix_relay:
|
||||||
|
# name:
|
||||||
|
# path:
|
||||||
|
|
||||||
user_session:
|
user_session:
|
||||||
# session_type: shared
|
# session_type: shared
|
||||||
|
@ -1402,6 +1402,24 @@ sub DefineConfigToCLIConversion {
|
|||||||
})
|
})
|
||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
|
KasmVNC::CliOption->new({
|
||||||
|
name => 'UnixRelay',
|
||||||
|
configKeys => [
|
||||||
|
KasmVNC::ConfigKey->new({
|
||||||
|
name => "network.unix_relay.name",
|
||||||
|
type => KasmVNC::ConfigKey::ANY
|
||||||
|
}),
|
||||||
|
KasmVNC::ConfigKey->new({
|
||||||
|
name => "network.unix_relay.path",
|
||||||
|
type => KasmVNC::ConfigKey::ANY
|
||||||
|
})
|
||||||
|
],
|
||||||
|
deriveValueSub => sub {
|
||||||
|
my $self = shift;
|
||||||
|
|
||||||
|
$self->{"network.unix_relay.name"} . ":" . $self->{"network.unix_relay.path"};
|
||||||
|
},
|
||||||
|
}),
|
||||||
KasmVNC::CliOption->new({
|
KasmVNC::CliOption->new({
|
||||||
name => 'AlwaysShared',
|
name => 'AlwaysShared',
|
||||||
configKeys => [
|
configKeys => [
|
||||||
|
Loading…
Reference in New Issue
Block a user