update..

group_vars/all/main.yml

@@ -675,11 +675,13 @@ microcode_intel_package:
 microcode_amd_package: 
   - amd64-microcode
 
-firmware_packages:
-  - firmware-linux
-  - firmware-linux-free
+firmware_packages_ubuntu:
+  - linux-firmware
 
-firmware_non_free_packages:
+firmware_packages_debian:
+  - firmware-linux
+
+firmware_non_free_packages_debian:
    - firmware-linux-nonfree
 
 apt_install_state: latest
@@ -1094,7 +1096,9 @@ nis_groups:
 
 #nis_deleted_user:
 remove_nis_users:
-   - name: frank
+   - name: anna
+   - name: birgit
+   - name: jonas
 
 nis_user:
   - name: chris
@@ -1113,16 +1117,6 @@ nis_user:
           3865353333373661390a643564386432643532396632323664383330646430613033643130626430
           6139
 
-  - name: anna
-    groups:
-      - intern
-      - verwaltung
-      - transfer
-      - scans
-      - lpadmin
-    is_samba_user: true
-    password: 'an20na11'
-
   - name: buero
     groups:
       - intern
@@ -1161,16 +1155,6 @@ nis_user:
     is_samba_user: true
     password: '20jib15ran'
 
-  - name: jonas
-    groups:
-      - intern
-      - verwaltung
-      - transfer
-      - scans
-      - lpadmin
-    is_samba_user: true
-    password: '20jo11nas'
-
   - name: julia
     groups:
       - verwaltung
@@ -1223,13 +1207,6 @@ nis_user:
     is_samba_user: true
     password: '20_thomas/19-!'
 
-  - name: birgit
-    groups:
-      - verwaltung
-      - scans
-    is_samba_user: true
-    password: '20-birgit_20%'
-
   - name: stefan
     groups:
       - verwaltung
@@ -1313,7 +1290,6 @@ samba_shares:
     vfs_object_recycle: true
     recycle_path: '@Recycle.Bin'
     user:
-      - anna
       - buero
       - chris 
       - jibran
@@ -1334,10 +1310,7 @@ samba_shares:
     vfs_object_recycle: true
     recycle_path: '@Recycle.Bin'
     user:
-      - anna
-      - jonas
       - buero
-      - birgit
       - chris
       - jibran
       - praktikum
@@ -1357,9 +1330,7 @@ samba_shares:
     vfs_object_recycle: true
     recycle_path: '@Recycle.Bin'
     user:
-      - anna
       - buero
-      - birgit
       - chris
       - jibran
       - praktikum
@@ -1440,16 +1411,6 @@ samba_shares:
     recycle_path: '@Recycle.Bin'
     user:
       - thomas
-  - name: Birgit_Scans
-    path: /data/samba/Scans/Birgit_Scans
-    group_valid_users: scans
-    group_write_list: scans
-    file_create_mask: '0660'
-    dir_create_mask: '2770'
-    vfs_object_recycle: true
-    recycle_path: '@Recycle.Bin'
-    user:
-      - birgit
   - name: Stefan_Scans
     path: /data/samba/Scans/Stefan_Scans
     group_valid_users: scans
@@ -1469,7 +1430,6 @@ samba_shares:
     vfs_object_recycle: false
     recycle_path: '@Recycle.Bin'
     user:
-      - anna
       - buero
       - chris
       - kamera
@@ -1486,7 +1446,6 @@ samba_shares:
     vfs_object_recycle: false
     recycle_path: '@Recycle.Bin'
     user:
-      - anna
       - buero
       - chris
       - kamera