Aktualisisert von Coderberg

roles/lmn_vm/tasks/main.yml

@@ -16,10 +16,13 @@
     name:
       - aria2
       - mktorrent
+      - guestfs-tools
       - libvirt-daemon-system
       - virt-manager
       - virt-viewer
       - dialog # for vm-netboot menu
+      - python3-impacket
+      - virtiofsd
 
     # - name: allow all users to use VMs
     #   lineinfile:
@@ -28,32 +31,6 @@
     #     insertafter: '#auth_unix_rw = "polkit"'
     #   notify: reload libvirtd
 
-- name: Configure pam_mount for VM bind mounts
-  ansible.builtin.blockinfile:
-    dest: /etc/security/pam_mount.conf.xml
-    marker: "<!-- {mark} ANSIBLE MANAGED BLOCK (bind mounts for VMs) -->"
-    block: |
-      <!-- bind mounts for the VMs, setting gid here does not work -->
-      <volume
-        path="~"
-        mountpoint="/lmn/media/%(USER)/home"
-        options="bind"
-        ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user>{% if localuser %}<user>{{ localuser }}</user>{% endif %}</or></not>
-      </volume>
-      <volume
-        path="/srv/samba/schools/default-school/share"
-        mountpoint="/lmn/media/%(USER)/share"
-        options="bind"
-        ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user>{% if localuser %}<user>{{ localuser }}</user>{% endif %}</or></not>
-      </volume>
-      <volume
-        path="/srv/samba/schools/default-school"
-        mountpoint="/lmn/media/%(USER)/school"
-        options="bind"
-        ><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user>{% if localuser %}<user>{{ localuser }}</user>{% endif %}</or></not>
-      </volume>
-    insertafter: "<!-- END ANSIBLE MANAGED BLOCK .* -->"
-
 - name: Use umount script for proper cleanup
   ansible.builtin.blockinfile:
     dest: /etc/security/pam_mount.conf.xml
@@ -143,14 +120,14 @@
     group: root
     mode: '0755'
   loop:
+    - vm-delete
     - vm-create
     - vm-rebase
     - vm-run
     - vm-upload
     - vm-sync
     - vm-link-images
-    - vm-virtiofsd
-    - virtiofsd
+    - vm-vminfo
     - vm-aria2
     - uploadseed
     - desktop-sync
@@ -237,3 +214,26 @@
     src: vm-netboot
     dest: /usr/local/bin/
     mode: '0755'
+
+- name: Provide vminfo service
+  ansible.builtin.copy:
+    content: |
+      [Unit]
+      Description=Create .vminfo.json for VMs
+      [Service]
+      Type=simple
+      ExecStart=/usr/bin/bash -c 'umask 077; /usr/local/bin/vm-vminfo > "{% if localhome %}/home{% else %}/lmn/media{% endif %}/${USER}/.vminfo.json"'
+    dest: /etc/systemd/user/vminfo.service
+    mode: '0644'
+
+- name: Provide vminfo timer
+  ansible.builtin.copy:
+    content: |
+      [Unit]
+      Description=Timer for vm-info
+      [Timer]
+      OnActiveSec=0s
+      OnUnitActiveSec=1h
+      Persistent=true
+    dest: /etc/systemd/user/vminfo.timer
+    mode: '0644'