Disable xfce4 screensaver rather than light-locker (add user docs)

alan-turing-institute / data-safe-haven

https://data-safe-haven.readthedocs.io

BSD 3-Clause "New" or "Revised" License

57 stars 15 forks source link

Disable xfce4 screensaver rather than light-locker (add user docs) #2128

Closed JimMadge closed 1 month ago

JimMadge commented 1 month ago

:white_check_mark: Checklist

[x] You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
[x] You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
[ ] Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).

:vertical_traffic_light: Depends on

:arrow_heading_up: Summary

Adds an Ansible task to disable xfce4-screensaver. This appears to not work due to a bug in xfce < 4.18.

Adds user documentation to disable screen locking if they find it a pain.

:closed_umbrella: Related issues

Related to #2101

:microscope: Tests

JimMadge commented 1 month ago

Testing in an SRE. The file is written as expected

jim.madge:autostart$ tail xfce4-screensaver.desktop
Exec=xfce4-screensaver
OnlyShowIn=XFCE;
NoDisplay=true
X-XFCE-Autostart-Phase=Application
X-XFCE-Autostart-Notify=true
X-XFCE-Bugzilla-Bugzilla=XFCE
X-XFCE-Bugzilla-Product=xfce4-screensaver
X-XFCE-Bugzilla-Component=general
X-XFCE-Bugzilla-Version=4.16.0
Hidden=true

JimMadge commented 1 month ago

Started a new xfce session by logging out then in again. Waiting to see if the screen locks after idling.

github-actions[bot] commented 1 month ago

Coverage report

This PR does not seem to contain any modification to coverable code.

JimMadge commented 1 month ago

Still locking after ~10 minutes.

JimMadge commented 1 month ago

There is this bug report which suggests there was an issue in xfce4-session<4.18 and we have xfce4-session==4.16.

JimMadge commented 1 month ago

~~Uninstalling xfce4-screensaver seems to work and doesn't break the xfce installation.~~ ~~It does mean that users can't intentionally lock the xrdp session.~~

I think we are comfortable with this though because users will always be on a client machine that they can lock.

Actually, that is a bad idea. The screen blanks and you are unable to unlock it :scream:. @jemrobinson I think it might be best to revert the change and accept this. Normal users should be able to disable screen locking after idle in the Xfce4 settings or by running xfce4-screensaver-preferences. We could add that to the user guide?

jemrobinson commented 1 month ago

Can you add it to the user guide as part of this PR? Ideally, after merging #2130.

JimMadge commented 1 month ago

Yep, just testing that it works now.