Merge branch 'fvs' of gitlab.steinbeisschule-reutlingen.de:L_MDT/debian-lan4fvs into fvs

roles/lmn_kde/tasks/main.yml

@@ -1,13 +1,4 @@
 ---
-- name: Provide sqlite backend to skip mysql installation later
-  apt:
-    name:
-      - akonadi-backend-sqlite
-    state: latest
-  environment:
-    http_proxy: http://firewall.pn.steinbeis.schule:3128
-    https_proxy: http://firewall.pn.steinbeis.schule:3128
-
 - name: Install desktop EDU packages and some more
   apt:
     name:
@@ -17,11 +8,12 @@
       - xdg-desktop-portal-kde
       - xdg-desktop-portal-wlr # share screen in browser
       - kde-full
-      - atftp
+      - akonadi-backend-sqlite
       - thunderbird-l10n-de
       - webext-privacy-badger
       - webext-ublock-origin-firefox
       - webext-ublock-origin-chromium
+      - atftp
       - emacs
       - elpa-magit
       - elpa-color-theme-modern
@@ -40,31 +32,27 @@
       - ghex
       - thonny
       - spyder
-#      - mu-editor
+      - mu-editor
       - dia
       - vym
       - tree
-      - ttf-mscorefonts-installer
       - sqlite3
       - sqlitebrowser
       - neovim
       - qtcreator
       - freecad
       - librecad
-#      - arduino
+      - arduino
       - kicad
       - keepassxc
       - tmux
       - curl
-#      - default-jre
       - pulseview
       - sigrok
       - sigrok-cli
       - codeblocks
+    autoremove: true
     state: latest
-  environment:
-    http_proxy: http://firewall.pn.steinbeis.schule:3128
-    https_proxy: http://firewall.pn.steinbeis.schule:3128
 
 - name: Add {{ ansible_distribution_release }}-backports
   apt_repository:
@@ -84,6 +72,23 @@
   when: ansible_distribution_release == 'bullseye'
 
 
+- name: Preseed ttf-mscorefonts-installer
+  ansible.builtin.debconf:
+    name: ttf-mscorefonts-installer
+    question: msttcorefonts/dlurl
+    value: http://livebox.pn.steinbeis.schule/mscorefonts/
+    vtype: string
+
+- name: Install fonts from local mirror
+  apt:
+    name:
+      - ttf-mscorefonts-installer
+    state: latest
+    autoremove: true
+  environment:
+    http_proxy: ''
+
+
 - name: Enable splash screen
   replace:
     dest: "/etc/default/grub"

roles/lmn_vm/tasks/main.yml

@@ -176,30 +176,30 @@
   changed_when: result.stdout | length > 0
 
 #### VMs
-- name: Deploy initial image list
-  copy:
-    src: images.list
-    dest: /var/lib/libvirt/images/images.list
-    force: false
-
-- name: rsync VM image definitions
-  command: >
-    rsync -a --itemize-changes
-    rsync://server:/vmimages-download/xml /var/lib/libvirt/images/
-  become: true
-  become_user: lmnsynci
-  register: result
-  changed_when: result.stdout | length > 0
-  when: not run_in_installer | default(false) | bool
-
-- name: rsync VM images
-  command: >
-    rsync -a -i --files-from=/var/lib/libvirt/images/images.list
-    rsync://server:/vmimages-download/ /var/lib/libvirt/images/
-  become: true
-  become_user: lmnsynci
-  register: result
-  changed_when: result.stdout | length > 0
-  when: >
-    false and not run_in_installer | default(false) | bool and (ansible_mounts |
-    selectattr("mount", "equalto", "/") | list)[0].size_available > 80000000000
+#- name: Deploy initial image list
+#  copy:
+#    src: images.list
+#    dest: /var/lib/libvirt/images/images.list
+#    force: false
+#
+#- name: rsync VM image definitions
+#  command: >
+#    rsync -a --itemize-changes
+#    rsync://server:/vmimages-download/xml /var/lib/libvirt/images/
+#  become: true
+#  become_user: lmnsynci
+#  register: result
+#  changed_when: result.stdout | length > 0
+#  when: not run_in_installer | default(false) | bool
+#
+#- name: rsync VM images
+#  command: >
+#    rsync -a -i --files-from=/lmn/lib/libvirt/images/images.list
+#    rsync://server:/vmimages-download/ /var/lib/libvirt/images/
+#  become: true
+#  become_user: lmnsynci
+#  register: result
+#  changed_when: result.stdout | length > 0
+#  when: >
+#    false and not run_in_installer | default(false) | bool and (ansible_mounts |
+#    selectattr("mount", "equalto", "/") | list)[0].size_available > 80000000000