From 3b9f509c8e98d06b3d0c2278d2b783f32e20e6f0 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 13 Aug 2021 19:34:05 +0200 Subject: [PATCH] update.. --- group_vars/all/main.yml | 38 +++++++++++++++++-- hosts | 4 ++ roles/common/tasks/main.yml | 16 ++++---- roles/common/tasks/nis-install-client.yml | 4 +- .../common/tasks/ubuntu-x11vnc-1804-amd64.yml | 15 ++++++++ .../common/tasks/ubuntu-x11vnc-2004-amd64.yml | 22 ++++++++++- 6 files changed, 83 insertions(+), 16 deletions(-) diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index 3dc13c4..f475651 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -732,10 +732,10 @@ nfs_exports: # # ! Notice ! -#remove_system_users: [] -remove_system_users: - - name: test - - name: jennifer.prost +remove_system_users: [] +#remove_system_users: +# - name: test +# - name: jennifer.prost system_users: [] #system_users: @@ -1059,6 +1059,13 @@ nis_user: - buero-scan is_samba_user: true password: '_F313r4b3nd*' + - name: honorar.mbr2 + groups: + - all-users + - mbr-buero + - buero-scan + is_samba_user: true + password: 'kQviLU-4rA_2' - name: honorar.rias1 groups: - all-users @@ -1274,6 +1281,13 @@ nis_user: - buero-scan is_samba_user: true password: 'sd7/SAqzU+Qi' + - name: till.hendlmeier + groups: + - all-users + - mbr-buero + - buero-scan + is_samba_user: true + password: '3/+v_7AGivxc' - name: ulf.balmer groups: - all-users @@ -1455,6 +1469,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1468,6 +1483,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: BVV-Projekt path: /data/shares/BVV-Projekt @@ -1509,6 +1525,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1522,6 +1539,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: Finanzen path: /data/shares/Finanzen @@ -1603,6 +1621,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1616,6 +1635,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: Mobilisierungsplattform path: /data/shares/Mobilisierungsplattform @@ -1657,6 +1677,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1670,6 +1691,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: Regishut path: /data/shares/Regishut @@ -1743,6 +1765,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1756,6 +1779,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: RIAS-Finanzen-Personal path: /data/shares/RIAS-Finanzen-Personal @@ -1818,6 +1842,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1831,6 +1856,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: VDK path: /data/shares/VDK @@ -1872,6 +1898,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1885,6 +1912,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer - name: Video path: /data/shares/Video @@ -1927,6 +1955,7 @@ samba_shares: - michael.sulies - pia.lamberty - honorar.mbr1 + - honorar.mbr2 - nina.rink - praktikum.bgn1 - praktikum.mbr1 @@ -1940,6 +1969,7 @@ samba_shares: - simon - sysadm - tanja.kinzel + - till.hendlmeier - ulf.balmer diff --git a/hosts b/hosts index 3fbf724..fc10df1 100644 --- a/hosts +++ b/hosts @@ -25,6 +25,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc131.mbr-bln.netz pc135.mbr-bln.netz [client_pc] @@ -51,6 +52,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc131.mbr-bln.netz pc135.mbr-bln.netz [nfs_client] @@ -77,6 +79,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc131.mbr-bln.netz pc135.mbr-bln.netz [nis_client] @@ -103,6 +106,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc131.mbr-bln.netz pc135.mbr-bln.netz [file_server] diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 2bb394b..ea1701b 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -139,14 +139,6 @@ - nis-samba-user -# tags supported inside mount_samba_shares.yml: -# -#- import_tasks: mount_samba_shares.yml -# when: "groups['client_pc']|string is search(inventory_hostname)" -# tags: -# - samba-shares - - # tags supported system-user-systemfiles.yml: # # profile @@ -200,6 +192,14 @@ - sudoers +# tags supported inside mount_samba_shares.yml: +# +#- import_tasks: mount_samba_shares.yml +# when: "groups['client_pc']|string is search(inventory_hostname)" +# tags: +# - samba-shares + + # Tasks: Configure VNC (x11vnc) for Ubuntu systems # # Supported OS: diff --git a/roles/common/tasks/nis-install-client.yml b/roles/common/tasks/nis-install-client.yml index 9bb7f7f..665b378 100644 --- a/roles/common/tasks/nis-install-client.yml +++ b/roles/common/tasks/nis-install-client.yml @@ -179,7 +179,7 @@ - name: (nis-install-client.yml) Adjust file /etc/nsswitch.conf (set hosts) replace: path: /etc/nsswitch.conf - regexp: '(hosts:\s+files)\s+([^nis].*)' + regexp: '(hosts:\s+files)\s+((?!nis).*)$' replace: '\1 nis \2' tags: - nis-install @@ -188,7 +188,7 @@ - name: (nis-install-client.yml) Adjust file /etc/nsswitch.conf (set passwd/group/shadow) replace: path: /etc/nsswitch.conf - regexp: '^({{ item }}:\s+.*)' + regexp: '^({{ item }}:\s+((?!nis).)*)$' replace: '\1 nis' with_items: - passwd diff --git a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml index eb05d10..0c939ea 100644 --- a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml @@ -24,6 +24,21 @@ shell: echo "$(id -u gdm)" register: grp_id_gdm + - name: Check if file '/etc/gdm3/custom.conf' exists + stat: + path: /etc/gdm3/custom.conf + register: etc_gdm_custom_conf_exists + + - name: Adjust file '/etc/gdm3/custom.conf' + lineinfile: + dest: /etc/gdm3/custom.conf + state: present + regexp: '^WaylandEnable' + line: 'WaylandEnable=false' + insertafter: '^#?\s*WaylandEnable' + when: + - etc_gdm_custom_conf_exists.stat.exists + - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password" raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass" diff --git a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml index 566cb24..8d97abf 100644 --- a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml @@ -27,10 +27,28 @@ - name: "(ubuntu-x11vnc-2004-amd64.yml) Store password" raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass" + - name: Check if file '/etc/gdm3/custom.conf' exists + stat: + path: /etc/gdm3/custom.conf + register: etc_gdm_custom_conf_exists + + - name: Adjust file '/etc/gdm3/custom.conf' + lineinfile: + dest: /etc/gdm3/custom.conf + state: present + regexp: '^WaylandEnable' + line: 'WaylandEnable=false' + insertafter: '^#?\s*WaylandEnable' + when: + - etc_gdm_custom_conf_exists.stat.exists + + - name: "(ubuntu-x11vnc-2004-amd64.yml) Set permissions on /etc/x11vnc.pass" file: - path: "/etc/x11vnc.pass" - mode: 0644 + path: /etc/x11vnc.pass + owner: root + group: root + mode: 0644 - name: "(ubuntu-x11vnc-2004-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" template: