current

desktop-config.yaml

@@ -0,0 +1,27 @@
+---
+
+- hosts:
+    - desktops
+    - laptops
+  remote_user: root
+  pre_tasks:
+    - name: ensure acpi tool is installed
+      apt:
+        pkg: acpi
+    - name: ensure host is on AC power
+      command: acpi -a
+      register: _acpi_ac_adapter
+      failed_when: '"off-line" in _acpi_ac_adapter.stdout'
+      changed_when: false
+  roles:
+    - name: display_manager
+      display_manager_state: maintenance
+      display_manager_maintenance_text: Konfigurationen werden angewendet und Programme werden installiert – bitte nicht abschalten!
+      display_manager_maintenance_icon: alacarte
+    - name: common
+    - name: users
+    - name: desktop
+    - name: desktop_bugfixes
+    - name: custom_desktop_apps
+    - name: backgrounds
+    - name: fonts

desktop-maintenance.yaml

@@ -0,0 +1,18 @@
+---
+
+- hosts:
+    - desktops
+    - laptops
+  remote_user: root
+  pre_tasks:
+    - name: ensure acpi tool is installed
+      apt:
+        pkg: acpi
+    - name: ensure host is on AC power
+      command: acpi -a
+      register: _acpi_ac_adapter
+      failed_when: '"off-line" in _acpi_ac_adapter.stdout'
+      changed_when: false
+  roles:
+    - name: display_manager
+      display_manager_state: maintenance

desktop-production.yaml

@@ -0,0 +1,27 @@
+---
+
+- hosts:
+    - desktops
+    - laptops
+  remote_user: root
+  pre_tasks:
+    - name: ensure acpi tool is installed
+      apt:
+        pkg: acpi
+    - name: ensure host is on AC power
+      command: acpi -a
+      register: _acpi_ac_adapter
+      failed_when: '"off-line" in _acpi_ac_adapter.stdout'
+      changed_when: false
+
+  roles:
+    - name: display_manager
+      display_manager_state: maintenance
+      display_manager_maintenance_text: Konfigurationen werden angewendet und Programme werden installiert – bitte nicht abschalten!
+      display_manager_maintenance_icon: alacarte
+    - name: common
+    - name: desktop
+    - name: desktop_bugfixes
+    - name: custom_desktop_apps
+    - name: backgrounds
+    - name: fonts

desktop-updates.yaml

@@ -0,0 +1,23 @@
+---
+
+- hosts:
+    - desktops
+    - laptops
+  remote_user: root
+  pre_tasks:
+    - name: ensure acpi tool is installed
+      apt:
+        pkg: acpi
+    - name: ensure host is on AC power
+      command: acpi -a
+      register: _acpi_ac_adapter
+      failed_when: '"off-line" in _acpi_ac_adapter.stdout'
+      changed_when: false
+  roles:
+    - name: display_manager
+      display_manager_state: maintenance
+      display_manager_maintenance_text: Aktualisierungen werden durchgeführt – bitte nicht abschalten!
+      display_manager_maintenance_icon: system-software-update
+    - name: updates
+      microcode_update: true
+      reboot_after_updates: true

desktop.yaml

@@ -1,28 +1,6 @@
 ---
 
-- hosts: desktops:laptops
-  remote_user: root
-  pre_tasks:
-  - name: ensure acpi tool is installed
-    apt:
-      pkg: acpi
-  - name: ensure host is on AC power
-    command: acpi -a
-    register: _acpi_ac_adapter
-    failed_when: '"off-line" in _acpi_ac_adapter.stdout'
-    changed_when: false
-  roles:
-    - name: display_manager
-      display_manager_state: maintenance
-      display_manager_maintenance_text: Aktualisierungen werden durchgeführt – bitte nicht abschalten!
-      display_manager_maintenance_icon: system-software-update
-    - name: updates
-      microcode_update: true
-      reboot_after_updates: true
-    - name: common
-    - name: desktop
-    - name: desktop_bugfixes
-    - name: custom_desktop_apps
-    - name: backgrounds
-    - name: fonts
-    - name: display_manager
+- import_playbook: desktop-maintenance.yaml
+- import_playbook: desktop-updates.yaml
+- import_playbook: desktop-config.yaml
+- import_playbook: desktop-production.yaml

maintenance.yaml

@@ -1,7 +0,0 @@
----
-
-- hosts: desktops:laptops
-  remote_user: root
-  roles:
-    - name: display_manager
-      display_manager_state: maintenance

roles/custom_desktop_apps/defaults/main.yaml

@@ -0,0 +1,4 @@
+install_fotowall: false
+install_cewe_fotobuch: false
+install_teamviewer: false
+install_zoom: true

roles/custom_desktop_apps/tasks/main.yaml

@@ -10,3 +10,6 @@
 
 - import_tasks: teamviewer.yaml
   when: install_teamviewer | default(false)
+
+- import_tasks: zoom.yaml
+  when: install_zoom | default(true)

roles/custom_desktop_apps/tasks/teamviewer.yaml

@@ -1,8 +1,4 @@
 ---
-- name: download teamviewer
-  get_url:
-    url: https://download.teamviewer.com/download/linux/teamviewer_amd64.deb
-    dest: /opt/teamviewer_amd64.deb
-- name: teamviewer package
+- name: teamviewer
   apt:
-    deb: /opt/teamviewer_amd64.deb
+    deb: https://download.teamviewer.com/download/linux/teamviewer_amd64.deb

roles/custom_desktop_apps/tasks/zoom.yaml

@@ -0,0 +1,4 @@
+---
+- name: zoom
+  apt:
+    deb: https://zoom.us/client/latest/zoom_amd64.deb

roles/kitaplus/tasks/main.yaml

@@ -1,12 +0,0 @@
----
-
-- name: kitaplus icon
-  get_url:
-    url: "{{kita_plus_url}}/images/kitaplus_steine_16.png"
-    dest: /usr/share/icons/kitaplus.png
-    checksum: sha256:103cf55bfe772b02ca1e35be36ee9a90f0547d6e75f4b5ac3d97be17a0aef200
-
-- name: kitaplus desktop file
-  template:
-    src: kitaplus.desktop.j2
-    dest: /usr/share/applications/kitaplus.desktop

roles/updates

@@ -1 +1 @@
-Subproject commit 810a08077a75b502a02d59d770f96e028f23ba0c
+Subproject commit 7a8187cbf431e41ba4001b12e4774f316235f676