From 3061cbac230ee6dc30e0cbe45f28aa3c021a4f4c Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 13 Jan 2021 15:07:18 +0100
Subject: [PATCH] Add group 'all-users' and change the order of tasks.

---
 group_vars/all/main.yml     | 107 ++++++++++++++++++++++++++++++++++++
 roles/common/tasks/main.yml |  18 +++---
 2 files changed, 116 insertions(+), 9 deletions(-)

diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index c78fe22..a4a95aa 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -795,6 +795,8 @@ nis_groups:
     group_id: 1700
   - name: bmb
     group_id: 1800
+  - name: all-users
+    group_id: 1900
 
 remove_nis_users: []
 #remove_nis_users:
@@ -804,6 +806,7 @@ remove_nis_users: []
 nis_user:
   - name: chris
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - mbr-personal
@@ -828,6 +831,7 @@ nis_user:
           6139
   - name: lokaladmin
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - mbr-personal
@@ -846,6 +850,7 @@ nis_user:
     password: 'd4r1usz'
   - name: sysadm
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - mbr-personal
@@ -864,30 +869,35 @@ nis_user:
     password: 'KPk_Wf2F'
   - name: alexander.lorenz.milord
     groups:
+      - all-users
       - regishut
       - buero-scan
     is_samba_user: true
     password: 'R3GI_20_poliz_!'
   - name: alexander.rasumny
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'twT9Rjbv9mjq'
   - name: alexander.steder
     groups:
+      - all-users
       - regishut
       - buero-scan
     is_samba_user: true
     password: 'SHUT_20_s3nc3!'
   - name: anna.mueller1
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '5xp5ll9ar13us!'
   - name: anne
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - mbr-personal
@@ -903,12 +913,14 @@ nis_user:
     password: 'YA!LiLiC0MP5'
   - name: axis
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '20_axis_16'
   - name: benjamin 
     groups:
+      - all-users
       - mbr-buero
       - vdk
       - rias
@@ -918,6 +930,7 @@ nis_user:
     password: 'C2-0U#ch'
   - name: bianca
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - mbr-personal
@@ -936,6 +949,7 @@ nis_user:
     password: '73_BiBole_29'
   - name: birgit.erhardt 
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - vdk
@@ -944,12 +958,14 @@ nis_user:
     password: '20_purpel!rain_17'
   - name: bjoern.renkewitz
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'Tz9-Wq-51'
   - name: christina.wendt
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - vdk
@@ -962,48 +978,56 @@ nis_user:
     password: '8!Varianten'
   - name: daniel.poensgen
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'rcMRCm7jcpbp'
   - name: doku.mbr2
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '*M0ss4d*'
   - name: doku.mbr4
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'PwmNvPh9KM4T'
   - name: dorina.feldmann
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '17?4XPQ_!abc'
   - name: felix.mueller
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'U_i5zAR5H+ti'
   - name: frederick.kannenberg
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'riasFK2019!#'
   - name: hamid.mohseni
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'TFhCW9J4Vn4F'
   - name: isabell.wiesner
     groups:
+      - all-users
       - mbr-buero
       - mbr-finanzen
       - vdk
@@ -1016,47 +1040,55 @@ nis_user:
     password: 'XY_bunt_2020!'
   - name: jennifer.pross
     groups:
+      - all-users
       - bmb
     is_samba_user: true
     password: 'V-S9Y/R+Am7H'
   - name: janine.budich
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'LoS_r3f_20_AS!'
   - name: johannes.radke
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'Furzf4brik!'
   - name: judith.heinmueller
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 't32_aHxV.'
   - name: julia.kopp
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '-a2%3bTzkW.A'
   - name: kerstin.kuballa
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'sVY2_2t+a+db'
   - name: lavinia.schwedersky
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'xJw.3R9vKf/N'
   - name: lena.mahler
     groups:
+      - all-users
       - mbr-buero
       - bgn
       - bgn-finanzen-personal
@@ -1065,6 +1097,7 @@ nis_user:
     password: 'YZ_bgn_2020!'
   - name: linda.giesel
     groups:
+      - all-users
       - buero-scan
       - regishut
       - regishut-personal-finanzen
@@ -1072,18 +1105,21 @@ nis_user:
     password: 'SHUT_20_s3nc3!'
   - name: manja.kasten
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'Rasili_&n'
   - name: mathias
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'p3r*45p3r4*4d*45tr4m'
   - name: matthias.mueller
     groups:
+      - all-users
       - mbr-buero
       - mbr-personal
       - buero-scan
@@ -1091,95 +1127,112 @@ nis_user:
     password: 'V1v@H@f3rdr1nk'
   - name: michael.sulies
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'Cryst4lp4l4c3'
   - name: pia.lamberty
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'oasd31*as+Q%'
   - name: honorar.mbr1
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '_F313r4b3nd*'
   - name: nina.rink
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'BMW_mobit_2020!'
   - name: pierre.ahrent
     groups:
+      - all-users
+      - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'GYiI3-s/_7wG'
   - name: praktikum.bgn1
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'MPL_baerin_20!'
   - name: praktikum.mbr1
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '2001_RAT_urban!'
   - name: praktikum.mbr2
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '20praktikum213'
   - name: praktikum.rias1
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '7z7F%d3cv_dfjz'
   - name: bianca.loy
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'ctnrk3CczcJ9'
   - name: praktikum.rias2
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'Q56V.6kf/JLQ'
   - name: honorar.rias1
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '6jA,nmD,fdK!'
   - name: samuel.signer
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'S4mmyC0mput3r!'
   - name: scan
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: '20scan13'
   - name: simon
     groups:
+      - all-users
       - mbr-buero
       - buero-scan
     is_samba_user: true
     password: 'S4u3rkr4ut!'
   - name: ulf.balmer
     groups:
+      - all-users
       - mbr-buero
       - bgn
       - bgn-finanzen-personal
@@ -1312,6 +1365,60 @@ samba_shares:
       - bianca
       - jennifer.pross
       - sysadm
+  - name: Buero-Organisation
+    path: /data/shares/Buero-Organisation
+    group_valid_users: all-users
+    group_write_list: all-users
+    file_create_mask: '0660'
+    dir_create_mask: '2770'
+    vfs_object_recycle: true
+    recycle_path: '@Recycle.Bin'
+    user:
+      - alexander.lorenz.milord
+      - alexander.rasumny
+      - alexander.steder
+      - anna.mueller1
+      - anne
+      - benjamin
+      - bianca
+      - birgit.erhardt
+      - bjoern.renkewitz
+      - christina.wendt
+      - chris
+      - daniel.poensgen
+      - doku.mbr2
+      - doku.mbr4
+      - dorina.feldmann
+      - felix.mueller
+      - hamid.mohseni
+      - isabell.wiesner
+      - janine.budich
+      - johannes.radke
+      - judith.heinmueller
+      - julia.kopp
+      - kerstin.kuballa
+      - lavinia.schwedersky
+      - lena.mahler
+      - linda.giesel
+      - manja.kasten
+      - mathias
+      - matthias.mueller
+      - michael.sulies
+      - pia.lamberty
+      - honorar.mbr1
+      - nina.rink
+      - praktikum.bgn1
+      - praktikum.mbr1
+      - praktikum.mbr2
+      - praktikum.rias1
+      - bianca.loy
+      - praktikum.rias2
+      - honorar.rias1
+      - samuel.signer
+      - scan
+      - simon
+      - sysadm
+      - ulf.balmer
   - name: BVV-Projekt
     path: /data/shares/BVV-Projekt
     group_valid_users: mbr-buero
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 52e9d98..1be8bee 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -40,6 +40,15 @@
   tags: git
 
 
+# tags supported inside nis-user.yml:
+#
+#    nis-user
+- import_tasks: nis-user.yml
+  when: "groups['nis_server']|string is search(inventory_hostname)"
+  tags:
+    - nis-user
+
+
 # tags supported inside ntp.yml:
 #
 #    ntp-server
@@ -111,15 +120,6 @@
     - nis-install-server
 
 
-# tags supported inside nis-user.yml:
-#
-#    nis-user
-- import_tasks: nis-user.yml
-  when: "groups['nis_server']|string is search(inventory_hostname)"
-  tags:
-    - nis-user
-
-
 # tags supported inside nis-install-client.yml:
 #
 #    nis-install-client