From c5bc638a17ad4e2a5f983ec874ceb4a44468b1c6 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 15 Sep 2019 11:54:09 +0000 Subject: [PATCH 1/6] screensaver setup in own role --- tasks/main.yaml | 3 ++- tasks/screensaver.yaml | 34 ---------------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 tasks/screensaver.yaml diff --git a/tasks/main.yaml b/tasks/main.yaml index 880ccf6..6e3c361 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -21,7 +21,8 @@ - import_tasks: clean.yaml - import_tasks: xfce.yaml -- import_tasks: screensaver.yaml +- import_role: + name: screensaver - import_tasks: backgrounds.yaml - import_tasks: fonts.yaml diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml deleted file mode 100644 index 469e142..0000000 --- a/tasks/screensaver.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- 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 From a1a467435a8463047ede34a351e10655b5df603b Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 15 Sep 2019 12:19:03 +0000 Subject: [PATCH 2/6] all computers are cleaned --- tasks/clean.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tasks/clean.yaml b/tasks/clean.yaml index ea35974..a733c7a 100644 --- a/tasks/clean.yaml +++ b/tasks/clean.yaml @@ -1,10 +1,7 @@ --- -- name: ensure old packages are absent - apt: - pkg: - - gwenview - - kipi-plugins - - kde-l10n-de - state: absent +# - name: ensure old packages are absent +# apt: +# pkg: +# state: absent From b7a6fb23d12b52b6a6a3c7c9af828519b708946f Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 15 Sep 2019 12:24:55 +0000 Subject: [PATCH 3/6] desktop package installation now is defined in general roles --- tasks/desktop_apps.yaml | 21 +-------------- tasks/main.yaml | 3 +-- tasks/multimedia.yaml | 11 -------- tasks/xfce-customization.yaml | 21 +++++++++++++++ tasks/xfce.yaml | 51 ----------------------------------- 5 files changed, 23 insertions(+), 84 deletions(-) delete mode 100644 tasks/multimedia.yaml create mode 100644 tasks/xfce-customization.yaml delete mode 100644 tasks/xfce.yaml diff --git a/tasks/desktop_apps.yaml b/tasks/desktop_apps.yaml index 062c2e2..fffd388 100644 --- a/tasks/desktop_apps.yaml +++ b/tasks/desktop_apps.yaml @@ -1,29 +1,10 @@ --- - import_role: - name: desktop_apps - -- import_role: - name: libreoffice - -- import_role: - name: firefox + name: desktop - import_tasks: fotowall.yaml when: install_fotowall - import_tasks: cewe_fotobuch.yaml when: install_cewe_fotobuch - -- name: additional desktop apps - apt: - pkg: - - simple-scan - - gthumb - - krita - - krita-l10n - - gimp - - gimp-help-de - - audacity - - notify-osd - - catfish diff --git a/tasks/main.yaml b/tasks/main.yaml index 6e3c361..1fcabab 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -20,14 +20,13 @@ - import_tasks: clean.yaml -- import_tasks: xfce.yaml - import_role: name: screensaver - import_tasks: backgrounds.yaml - import_tasks: fonts.yaml - import_tasks: desktop_apps.yaml -- import_tasks: multimedia.yaml +- import_tasks: xfce-customization.yaml - import_tasks: media-access-bug.yaml diff --git a/tasks/multimedia.yaml b/tasks/multimedia.yaml deleted file mode 100644 index cc421dd..0000000 --- a/tasks/multimedia.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -- name: multimedia packages - apt: - pkg: - - vlc - - vlc-l10n - - libdvd-pkg - - libdvdread4 - - openshot - - openshot-doc diff --git a/tasks/xfce-customization.yaml b/tasks/xfce-customization.yaml new file mode 100644 index 0000000..c213ccc --- /dev/null +++ b/tasks/xfce-customization.yaml @@ -0,0 +1,21 @@ +--- + +- name: xdg config + copy: + src: xdg/ + dest: /etc/xdg/ + +- name: xfce panel config + template: + src: xfce4-panel.xml.j2 + dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + +- name: whiskermenu config + template: + src: whiskermenu-1.rc.j2 + dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc + +- name: xfwm4 config + template: + src: xfwm4.xml.j2 + dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml deleted file mode 100644 index fd86463..0000000 --- a/tasks/xfce.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- - -- name: desktop packages - apt: - pkg: - - xfce4 - - task-desktop - - task-xfce-desktop - - task-german - - task-german-desktop - - dmz-cursor-theme - - gnome-brave-icon-theme - - gnome-dust-icon-theme - - gnome-human-icon-theme - - gnome-icon-theme - - gnome-icon-theme-gartoon - - gnome-icon-theme-nuovo - - gnome-icon-theme-suede - - gnome-icon-theme-yasis - - gnome-extra-icons - - gnome-illustrious-icon-theme - - gnome-noble-icon-theme - - gnome-wine-icon-theme - - gnome-wise-icon-theme - - xfonts-terminus - - gvfs - - gvfs-backends - - gvfs-bin - - gvfs-fuse - - zip - - unzip - -- name: xdg config - copy: - src: xdg/ - dest: /etc/xdg/ - -- name: xfce panel config - template: - src: xfce4-panel.xml.j2 - dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml - -- name: whiskermenu config - template: - src: whiskermenu-1.rc.j2 - dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc - -- name: xfwm4 config - template: - src: xfwm4.xml.j2 - dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml From 979ffd6103186aa0f4af51e4c05e7d7681bfe4a2 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Tue, 17 Sep 2019 12:35:30 +0000 Subject: [PATCH 4/6] 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 From cc3f9d50653f6bf2c32c44e230b975080019c368 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Tue, 17 Sep 2019 12:44:26 +0000 Subject: [PATCH 5/6] screensaver settings removed --- defaults/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e236441..14fb16f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -34,6 +34,3 @@ kiosk_unlocked_users: root xfwm4_use_compositing: true xfce_lock_panel: true - -xscreensaver_dpms: true -xscreensaver_timeout: 900 From dc655e9660bdd80e10ae6e0d36fd6c2668746888 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Tue, 17 Sep 2019 12:46:25 +0000 Subject: [PATCH 6/6] gdmflexiserver fake removed --- files/gdmflexiserver-fake.sh | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 files/gdmflexiserver-fake.sh diff --git a/files/gdmflexiserver-fake.sh b/files/gdmflexiserver-fake.sh deleted file mode 100644 index f638861..0000000 --- a/files/gdmflexiserver-fake.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/bin/dm-tool switch-to-greeter