From 0cc41715d806133dab6d0d36b2eda4ee5e23fffe Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andreas.mundt@steinbeisschule-reutlingen.de>
Date: Sun, 22 Jan 2023 11:49:57 +0100
Subject: [PATCH] Configure KDE, move package installation to extra role.

---
 lmn-desktop.yml                               | 41 ++---------
 roles/lmn_kde/handlers/main.yml               | 10 +++
 roles/lmn_kde/tasks/main.yml                  | 71 +++++++++++++++++++
 .../defaults/main.yml                         |  0
 roles/{lmn-mount => lmn_mount}/tasks/main.yml |  0
 .../{lmn-sssd => lmn_sssd}/handlers/main.yml  |  0
 roles/{lmn-sssd => lmn_sssd}/tasks/main.yml   |  0
 .../templates/sssd.conf.j2                    |  0
 8 files changed, 87 insertions(+), 35 deletions(-)
 create mode 100644 roles/lmn_kde/handlers/main.yml
 create mode 100644 roles/lmn_kde/tasks/main.yml
 rename roles/{lmn-mount => lmn_mount}/defaults/main.yml (100%)
 rename roles/{lmn-mount => lmn_mount}/tasks/main.yml (100%)
 rename roles/{lmn-sssd => lmn_sssd}/handlers/main.yml (100%)
 rename roles/{lmn-sssd => lmn_sssd}/tasks/main.yml (100%)
 rename roles/{lmn-sssd => lmn_sssd}/templates/sssd.conf.j2 (100%)

diff --git a/lmn-desktop.yml b/lmn-desktop.yml
index 5fe1c6e..00d5f68 100644
--- a/lmn-desktop.yml
+++ b/lmn-desktop.yml
@@ -1,4 +1,4 @@
-## This playbook deploys a FvS desktop machine for LinuxMuster.
+## This playbook deploys a FvS KDE desktop machine for LinuxMuster.
 ---
 - name: apply configuration to the machines
   hosts: all
@@ -16,50 +16,21 @@
   vars:
     domain: "pn.steinbeis.schule"
     extra_pkgs:
-      - thunderbird-l10n-de
-      - webext-privacy-badger
-      - webext-ublock-origin
       - vim
-      - emacs
-      - elpa-magit
-      - elpa-color-theme-modern
-      - vlc
-      - gimp
-      - inkscape
-      - flameshot
-      - bluefish
-      - git
-      - gitk
-      - gitg
       - mc
       - tmux
-      - wireshark
-      - nmap
-      - netcat-openbsd
-      - net-tools
-      - ghex
-      - thonny
-      - spyder
-      - mu-editor
-      - dia
-      - vym
-      - tree
       - console-setup
-      - virt-manager
-      - libreoffice-l10n-de
       - krb5-user
       - unattended-upgrades
-    extra_pkgs_bpo: [ libreoffice ] # [ linux-image-amd64 ]  # [ libreoffice ]
+    extra_pkgs_bpo: [] # [ linux-image-amd64 ]  # [ libreoffice ]
     ansible_python_interpreter: "/usr/bin/python3"
 
   roles:
-    ## Choose either gnome or KDE:
-    #- gnome
-    - kde
     - up2date_debian
-    - lmn-sssd
-    - lmn-mount
-#    - fvs-client
+    - lmn_sssd
+    - lmn_mount
+    - kde
+    - lmn_kde
 
   tasks:
     - name: Add local user 'virti' in the 'libvirt' group
diff --git a/roles/lmn_kde/handlers/main.yml b/roles/lmn_kde/handlers/main.yml
new file mode 100644
index 0000000..6a3b3d5
--- /dev/null
+++ b/roles/lmn_kde/handlers/main.yml
@@ -0,0 +1,10 @@
+- name: run update-grub
+  command: update-grub
+  listen: update grub
+
+- name: enable tmp.mount
+  systemd:
+    daemon_reload: yes
+    name: tmp.mount
+    enabled: yes
+  listen: enable tmp.mount
diff --git a/roles/lmn_kde/tasks/main.yml b/roles/lmn_kde/tasks/main.yml
new file mode 100644
index 0000000..3b80d0d
--- /dev/null
+++ b/roles/lmn_kde/tasks/main.yml
@@ -0,0 +1,71 @@
+---
+- name: install desktop EDU packages and some more
+  apt:
+    name:
+      - thunderbird-l10n-de
+      - webext-privacy-badger
+      - webext-ublock-origin
+      - emacs
+      - elpa-magit
+      - elpa-color-theme-modern
+      - vlc
+      - gimp
+      - inkscape
+      - flameshot
+      - bluefish
+      - git
+      - gitk
+      - gitg
+      - wireshark
+      - nmap
+      - netcat-openbsd
+      - net-tools
+      - ghex
+      - thonny
+      - spyder
+      - mu-editor
+      - dia
+      - vym
+      - tree
+      - virt-manager
+      - libreoffice-l10n-de
+      - xdg-desktop-portal-kde
+    state: latest
+
+- name: set homepage
+  lineinfile:
+    dest: /etc/firefox-esr/firefox-esr.js
+    line: pref("browser.startup.homepage", "https://www.startpage.com");
+
+- name: tune SDDM login
+  blockinfile:
+    path: /etc/sddm.conf
+    create: true
+    block: |
+      [Users]
+      MaximumUid=999
+      RememberLastUser=false
+      RememberLastSession=false
+
+
+################# from kiosk.yml ##################
+- name: grub timeout
+  lineinfile:
+    dest: /etc/default/grub
+    regexp: '^(GRUB_TIMEOUT=).*'
+    line: '\g<1>1'
+    backrefs: yes
+  notify: update grub
+
+- name: keyboard compose key
+  lineinfile:
+    dest: /etc/default/keyboard
+    regexp: '^(XKBOPTIONS=).*'
+    line: '\1"compose:caps"'
+    backrefs: yes
+
+- name: tmp on tmpfs
+  command: cp /usr/share/systemd/tmp.mount /etc/systemd/system/
+  args:
+    creates: /etc/systemd/system/tmp.mount
+  notify: enable tmp.mount
diff --git a/roles/lmn-mount/defaults/main.yml b/roles/lmn_mount/defaults/main.yml
similarity index 100%
rename from roles/lmn-mount/defaults/main.yml
rename to roles/lmn_mount/defaults/main.yml
diff --git a/roles/lmn-mount/tasks/main.yml b/roles/lmn_mount/tasks/main.yml
similarity index 100%
rename from roles/lmn-mount/tasks/main.yml
rename to roles/lmn_mount/tasks/main.yml
diff --git a/roles/lmn-sssd/handlers/main.yml b/roles/lmn_sssd/handlers/main.yml
similarity index 100%
rename from roles/lmn-sssd/handlers/main.yml
rename to roles/lmn_sssd/handlers/main.yml
diff --git a/roles/lmn-sssd/tasks/main.yml b/roles/lmn_sssd/tasks/main.yml
similarity index 100%
rename from roles/lmn-sssd/tasks/main.yml
rename to roles/lmn_sssd/tasks/main.yml
diff --git a/roles/lmn-sssd/templates/sssd.conf.j2 b/roles/lmn_sssd/templates/sssd.conf.j2
similarity index 100%
rename from roles/lmn-sssd/templates/sssd.conf.j2
rename to roles/lmn_sssd/templates/sssd.conf.j2