Feature/extra groups on nibbler

group_vars/all/vars.yml

@@ -30,7 +30,7 @@ public_keys_of_local_admins: "{{ local_admin_users | map('extract', auth_users)
 #
 # Local group specs.
 # Note:
-#  *  all local groups are listed here.
+#  * All local groups are listed here.
 #  * In ../[name]_cluster/vars.yml we list which groups are created locally on which cluster.
 #  * Never ever change nor recycle a GID value here unless you are in for a surprise...
 #
@@ -47,6 +47,8 @@ auth_groups:
     gid: 20004
   umcg-atd:
     gid: 20005
+  funad:
+    gid: 20006
 #
 # Default for a group of users that are only allowd to transfer data.
 # Is used by the sshd role and listed in

group_vars/fender_cluster/vars.yml

@@ -77,15 +77,17 @@ local_admin_users:
   - 'wim'
 envsync_user: 'envsync'
 envsync_group: 'depad'
+functional_admin_group: 'funad'
 hpc_env_prefix: '/apps'
 regular_groups:
+  - "{{ envsync_group }}"
+  - "{{ functional_admin_group }}"
   - 'users'
-  - 'depad'
   - 'solve-rd'
   - 'umcg-atd'
 regular_users:
-  - user: 'envsync'
-    groups: ['depad']
+  - user: "{{ envsync_user }}"
+    groups: ["{{ envsync_group }}"]
   - user: 'solve-rd-dm'
     groups: ['solve-rd']
     sudoers: '%solve-rd'
@@ -96,21 +98,21 @@ regular_users:
     groups: ['solve-rd']
     sudoers: '%solve-rd'
   - user: 'gvdvries'
-    groups: ['users', 'depad','umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'mbijlsma'
-    groups: ['users', 'depad','umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'mswertz'
-    groups: ['users', 'depad','umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'pneerincx'
-    groups: ['users', 'depad','umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'rkanninga'
-    groups: ['users', 'depad','umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'ljohansson'
-    groups: ['users', 'depad','umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'ddanis'
     groups: ['users', 'solve-rd']
   - user: 'dhendriksen'
-    groups: ['users', 'solve-rd', 'depad']
+    groups: ['users', "{{ envsync_group }}", 'solve-rd']
   - user: 'ksablauskas'
     groups: ['users', 'solve-rd']
   - user: 'wsteyaert'
@@ -132,17 +134,17 @@ regular_users:
   - user: 'cthomas'
     groups: ['users', 'solve-rd']
   - user: 'mbenjamins'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'lmatalonga'
     groups: ['users', 'solve-rd']
   - user: 'gbullich'
     groups: ['users', 'solve-rd']
   - user: 'ebenetti'
     groups: ['users', 'solve-rd']
   - user: 'kdelange'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'scimerman'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'sli'
     groups: ['users', 'solve-rd']
   - user: 'rschuele'
@@ -188,7 +190,7 @@ regular_users:
   - user: 'byaldiz'
     groups: ['users', 'solve-rd']
   - user: 'bcharbon'
-    groups: ['users', 'depad', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'solve-rd']
   - user: 'amaver'
     groups: ['users', 'solve-rd']
   - user: 'cgilissen'

group_vars/gearshift_cluster/vars.yml

@@ -63,7 +63,6 @@ ldap_group_quota_hard_limit_template: 'ruggroupumcgquotaLFS'
 filter_passwd: '(|(rugpersonentitlementvalue=scz)(rugpersonentitlementvalue=umcg))'
 filter_shadow: '(|(rugpersonentitlementvalue=scz)(rugpersonentitlementvalue=umcg))'
 pam_authz_search: '(|(&(objectClass=posixGroup)(cn=co_bbmri_g-GRP_Gearshift)(memberUid=$username))(&(cn=$username)(rugpersonentitlementvalue=umcg)))'
-data_transfer_only_group: umcg-sftp-only
 nameservers: [
   '172.23.40.244', # Order is important: local DNS for Isilon storage first!
   '8.8.4.4',       # Google DNS.
@@ -86,11 +85,15 @@ local_admin_users:
   - 'marlies'
   - 'robin'
   - 'wim'
+data_transfer_only_group: umcg-sftp-only
 envsync_user: 'umcg-envsync'
 envsync_group: 'umcg-depad'
 functional_admin_group: 'umcg-funad'
 hpc_env_prefix: '/apps'
 regular_groups:
+  - "{{ data_transfer_only_group }}"
+  - "{{ envsync_group }}"
+  - "{{ functional_admin_group }}"
   - 'umcg-aad'
   - 'umcg-as'
   - 'umcg-atd'
@@ -100,7 +103,6 @@ regular_groups:
   - 'umcg-cineca'
   - 'umcg-dag3'
   - 'umcg-datateam'
-  - 'umcg-depad'
   - 'umcg-ejp-rd'
   - 'umcg-endocrinology'
   - 'umcg-franke-scrna'
@@ -134,6 +136,8 @@ regular_groups:
   - 'umcg-weersma'
   - 'umcg-wijmenga'
 regular_users:
+  - user: "{{ envsync_user }}"
+    groups: ["{{ envsync_group }}"]
   - user: 'umcg-aad-dm'
     groups: ['umcg-aad']
     sudoers: '%umcg-aad'

group_vars/hyperchicken_cluster/vars.yml

@@ -77,33 +77,35 @@ local_admin_users:
   - 'wim'
 envsync_user: 'envsync'
 envsync_group: 'depad'
+functional_admin_group: 'funad'
 hpc_env_prefix: '/apps'
 regular_groups:
+  - "{{ envsync_group }}"
+  - "{{ functional_admin_group }}"
   - 'users'
-  - 'depad'
   - 'solve-rd'
   - 'umcg-atd'
 regular_users:
-  - user: 'envsync'
-    groups: ['depad']
+  - user: "{{ envsync_user }}"
+    groups: ["{{ envsync_group }}"]
   - user: 'solve-rd-dm'
     groups: ['solve-rd']
     sudoers: '%solve-rd'
   - user: 'umcg-atd-dm'
     groups: ['umcg-atd']
     sudoers: '%umcg-atd'
   - user: 'gvdvries'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'mbijlsma'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'mswertz'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'pneerincx'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'rkanninga'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
   - user: 'scimerman'
-    groups: ['users', 'depad', 'umcg-atd', 'solve-rd']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'solve-rd']
 #
 # Shared storage related variables
 #

group_vars/marvin_cluster/vars.yml

@@ -64,8 +64,6 @@ nameservers: [
 local_admin_groups:
   - 'admin'
   - 'docker'
-  - 'umcg-atd'
-  - 'depad'
 local_admin_users:
   - 'egon'
   - 'gerben'
@@ -75,47 +73,43 @@ local_admin_users:
   - 'morris'
   - 'pieter'
   - 'wim'
-  - 'umcg-atd-dm'
-  - 'envsync'
 envsync_user: 'envsync'
 envsync_group: 'depad'
+functional_admin_group: 'funad'
 hpc_env_prefix: '/apps'
 regular_groups:
+  - "{{ envsync_group }}"
+  - "{{ functional_admin_group }}"
   - 'users'
-  - 'depad'
   - 'erknet'
   - 'euro-nmd'
   - 'ern-liver'
   - 'umcg-atd'
 regular_users:
-  - user: 'envsync'
-    groups: ['depad']
-
+  - user: "{{ envsync_user }}"
+    groups: ["{{ envsync_group }}"]
   - user: 'erknet-dm'
     groups: ['erknet']
     sudoers: '%erknet'
-
   - user: 'euro-nmd-dm'
     groups: ['euro-nmd']
     sudoers: '%euro-nmd'
-
   - user: 'ern-liver-dm'
     groups: ['ern-liver']
     sudoers: '%ern-liver'
-
   - user: 'umcg-atd-dm'
     groups: ['umcg-atd']
     sudoers: '%umcg-atd'
   - user: 'gvdvries'
-    groups: ['users', 'depad', 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
   - user: 'mbijlsma'
-    groups: ['users', 'depad', 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
   - user: 'mswertz'
-    groups: ['users', 'depad', 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
   - user: 'pneerincx'
-    groups: ['users', 'depad', 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
   - user: 'rkanninga'
-    groups: ['users', 'depad', 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
+    groups: ['users', "{{ envsync_group }}", 'umcg-atd', 'erknet', 'euro-nmd','ern-liver']
   - user: 'umcg-atd-dm'
     groups: ['users', 'umcg-atd']
     sudoers: 'pieter,gerben'