diff options
| author | Simon Rettberg | 2023-07-04 15:37:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-07-04 15:37:14 +0200 |
| commit | db54a2fec6c0201c759bae40dda6152e7a0f0a1a (patch) | |
| tree | b5bb6b2cc7267d4e40b3fba312e283af1f12948e | |
| parent | [debug-report-bwlp] Add lsiommu (diff) | |
| download | mltk-db54a2fec6c0201c759bae40dda6152e7a0f0a1a.tar.gz mltk-db54a2fec6c0201c759bae40dda6152e7a0f0a1a.tar.xz mltk-db54a2fec6c0201c759bae40dda6152e7a0f0a1a.zip | |
[remote-access] Try to use https for sat comms
| -rwxr-xr-x | core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver index f168d55a..36e91527 100755 --- a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver +++ b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver @@ -74,7 +74,13 @@ # Delay this a bit until x11vnc is ready, and since we might potentially have had a race # with the ~poweron event, which would reset the password in the database. ( - url="http://${SLX_PXE_SERVER_IP}/slx-admin/api.php?do=remoteaccess" + if [ -n "$SLX_REMOTE_LOG" ]; then + url="${SLX_REMOTE_LOG//=clientlog/=remoteaccess}" + elif [ -n "$SLX_PVS_CONFIG_URL" ]; then + url="${SLX_PVS_CONFIG_URL//=roomplanner/=remoteaccess}" + else + url="http://${SLX_PXE_SERVER_IP}/slx-admin/api.php?do=remoteaccess" + fi for _ in {1..20}; do sleep 1 [ -e "/etc/cron.d/usage_stats" ] && break |