From 979ffd6103186aa0f4af51e4c05e7d7681bfe4a2 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Tue, 17 Sep 2019 12:35:30 +0000
Subject: [PATCH] screensaver is handled in own role

---
 tasks/screensaver.yaml               | 34 +++++++++++++++++++++++++++
 templates/Xresources.xscreensaver.j2 | 35 ----------------------------
 2 files changed, 34 insertions(+), 35 deletions(-)
 create mode 100644 tasks/screensaver.yaml
 delete mode 100644 templates/Xresources.xscreensaver.j2

diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml
new file mode 100644
index 0000000..469e142
--- /dev/null
+++ b/tasks/screensaver.yaml
@@ -0,0 +1,34 @@
+---
+
+- name: ensure old screensavers are absent
+  apt:
+    pkg:
+      - light-locker
+    state: absent
+
+- name: uninstall light-locker-settings
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - /usr/bin/light-locker-settings
+    - /usr/share/applications/light-locker-settings.desktop
+    - /usr/share/light-locker-settings
+    - /usr/share/doc/light-locker-settings
+    - /opt/light-locker-settings-1.5.3
+    - /opt/light-locker-settings-1.5.3.tar.bz2
+
+- name: install xscreensaver
+  apt:
+    pkg: xscreensaver
+
+- name: xscreensaver default settings
+  template:
+    src: Xresources.xscreensaver.j2
+    dest: /etc/X11/Xresources/xscreensaver
+
+- name: gdmflexiserver dummy script
+  copy:
+    src: gdmflexiserver-fake.sh
+    dest: /usr/local/bin/gdmflexiserver
+    mode: 0755
diff --git a/templates/Xresources.xscreensaver.j2 b/templates/Xresources.xscreensaver.j2
deleted file mode 100644
index f6f962e..0000000
--- a/templates/Xresources.xscreensaver.j2
+++ /dev/null
@@ -1,35 +0,0 @@
-xscreensaver.mode: blank
-
-xscreensaver.timeout: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.lockTimeout: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.passwdTimeout: 0:00:30
-
-{% if xscreensaver_dpms %}
-xscreensaver.dpmsEnabled: True
-xscreensaver.dpmsQuickoffEnabled: True
-xscreensaver.dpmsStandby: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.dpmsSuspend: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-xscreensaver.dpmsOff: {{ (xscreensaver_timeout / 60 / 60) | round(0,'floor') | int }}:{{ (xscreensaver_timeout / 60 % 60) | round(0,'floor') | int }}:{{ xscreensaver_timeout % 60 }}
-{% else %}
-xscreensaver.dpmsEnabled: False
-xscreensaver.dpmsQuickoffEnabled: False
-{% endif %}
-
-xscreensaver.cycle: 0:15:00
-
-xscreensaver.grabDesktopImages: False
-xscreensaver.grabVideoFrames: False
-xscreensaver.chooseRandomImages: True
-
-xscreensaver.lock: True
-
-xscreensaver.fade: True
-xscreensaver.unfade: False
-xscreensaver.fadeSeconds: 0:00:03
-
-xscreensaver.splash: False
-
-xscreensaver.passwd.heading.label: XScreenSaver
-xscreensaver.passwd.body.label: Dieser Bildschirm ist gesperrt.
-xscreensaver.passwd.unlock.label: OK
-xscreensaver.passwd.login.label: Benutzer wechseln