Skip to content

Commit

Permalink
The socket directories override from CLI is not necessary, because:
Browse files Browse the repository at this point in the history
  * Socket-activated Xpra proxy server listens on TCP port 14500,
    and does not bind to any Unix domain socket via '--bind=none'.

  * Non-socket-activated Xpra proxy server listens on TCP port 14500
    and does bind on '/run/xpra/system' domain socket via
    '--bind=/run/xpra/system'.

The negative side effect of restricting 'DotXpra.socket_details'
to search only in '/run/xpra' is that existing sockets in
'$XDG_RUNTIME_DIR/xpra' can not be found by 'make_authenticators',
so remote user can not re-attach to existing Xpra backend server
via proxy.

Signed-off-by: Vasyl Gello <[email protected]>
  • Loading branch information
basilgello authored and totaam committed Sep 24, 2021
1 parent 0f07bff commit ef6688f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fs/lib/systemd/system/xpra-nosocketactivation.service
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ EnvironmentFile=-/etc/default/xpra
ExecStart=/usr/bin/xpra proxy :14500 --daemon=no \
--bind-tcp=0.0.0.0:14500 --tcp-auth=${TCP_AUTH} \
--ssl-cert=/etc/xpra/ssl-cert.pem --ssl=on \
--bind=/run/xpra/system --auth=${AUTH} --socket-dirs=/run/xpra --socket-permissions=666 \
--bind=/run/xpra/system --auth=${AUTH} --socket-permissions=666 \
--log-dir=/var/log --pidfile=/run/xpra/proxy.pid --debug=${DEBUG}
#rely on SIGKILL which returns 128+15=143
SuccessExitStatus=0 143
Expand Down
2 changes: 1 addition & 1 deletion fs/lib/systemd/system/xpra.service
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EnvironmentFile=-/etc/sysconfig/xpra
ExecStart=/usr/bin/xpra proxy :14500 --daemon=no \
--tcp-auth=${TCP_AUTH} \
--ssl-cert=/etc/xpra/ssl-cert.pem --ssl=on \
--bind=none --auth=${AUTH} --socket-dirs=/run/xpra --socket-permissions=666 \
--bind=none --auth=${AUTH} --socket-permissions=666 \
--log-dir=/var/log --pidfile=/run/xpra/proxy.pid --debug=${DEBUG}
#rely on SIGKILL which returns 128+15=143
SuccessExitStatus=0 143
Expand Down

0 comments on commit ef6688f

Please sign in to comment.