From 16b542703adae636d2b242de239a8c21ae476b64 Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 9 Jun 2021 23:36:44 +0200 Subject: [PATCH] update .. --- ansible.cfg | 8 +------- group_vars/all/main.yml | 2 +- hosts | 4 ++++ roles/common/tasks/main.yml | 10 +++++----- .../common/tasks/ubuntu-x11vnc-1804-amd64.yml | 8 ++++++-- .../common/tasks/ubuntu-x11vnc-2004-amd64.yml | 20 +++++++++++-------- roles/common/templates/etc/samba/smb.conf.j2 | 2 +- .../lib/systemd/system/x11vnc-gdm3.service.j2 | 11 ++++++++++ 8 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2 diff --git a/ansible.cfg b/ansible.cfg index 74e5fc0..6d72bba 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -10,13 +10,7 @@ [defaults] -#ansible_managed = ** Ansible managed: DO NOT EDIT DIRECTLY ** -ansible_managed = ############################################ # - # -------------------------- # - # ** DO NOT EDIT DIRECTLY ** # - # -------------------------- # - # Ansible managed file # - # ############################################ # +ansible_managed = *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** #gathering = smart #fact_caching = jsonfile #fact_caching_connection = ~/.cache/ diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index 5bd724a..810277b 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -558,7 +558,7 @@ microcode_amd_package: - amd64-microcode firmware_packages_ubuntu: - - firmware-linux + - linux-firmware firmware_packages_debian: - firmware-linux diff --git a/hosts b/hosts index 18158b2..3fbf724 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 +pc135.mbr-bln.netz [client_pc] pc101.mbr-bln.netz @@ -50,6 +51,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc135.mbr-bln.netz [nfs_client] pc101.mbr-bln.netz @@ -75,6 +77,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc135.mbr-bln.netz [nis_client] pc101.mbr-bln.netz @@ -100,6 +103,7 @@ pc124.mbr-bln.netz pc125.mbr-bln.netz pc126.mbr-bln.netz pc127.mbr-bln.netz +pc135.mbr-bln.netz [file_server] file-mbr.mbr-bln.netz ansible_user=root diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index e49c4c4..2bb394b 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -239,8 +239,8 @@ -- name: "Configure LUKS" - import_tasks: luks.yml - when: "groups['client_pc']|string is search(inventory_hostname)" - tags: - - luks +#- name: "Configure LUKS" +# import_tasks: luks.yml +# when: "groups['client_pc']|string is search(inventory_hostname)" +# tags: +# - luks diff --git a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml index 7fe1792..eb05d10 100644 --- a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml @@ -18,7 +18,11 @@ state: present vars: packages: - - x11vnc + - x11vnc + + - name: "(ubuntu-x11vnc-1804-amd64.yml) get numeric id for group 'gdm'" + shell: echo "$(id -u gdm)" + register: grp_id_gdm - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password" raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass" @@ -30,7 +34,7 @@ - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" template: - src: lib/systemd/system/x11vnc.service.j2 + src: lib/systemd/system/x11vnc-gdm3.service.j2 dest: /lib/systemd/system/x11vnc.service - name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service" diff --git a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml index c74859c..566cb24 100644 --- a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml @@ -11,36 +11,40 @@ # Source: # - http://c-nergy.be/blog/?p=8984 - - name: "(ubuntu-x11vnc-1804-amd64.yml) Install packages" + - name: "(ubuntu-x11vnc-2004-amd64.yml) Install packages" apt: name: "{{ packages }}" update_cache: yes state: present vars: packages: - - x11vnc + - x11vnc - - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password" + - name: "(ubuntu-x11vnc-2004-amd64.yml) get numeric id for group 'gdm'" + shell: echo "$(id -u gdm)" + register: grp_id_gdm + + - name: "(ubuntu-x11vnc-2004-amd64.yml) Store password" raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass" - - name: "(ubuntu-x11vnc-1804-amd64.yml) Set permissions on /etc/x11vnc.pass" + - name: "(ubuntu-x11vnc-2004-amd64.yml) Set permissions on /etc/x11vnc.pass" file: path: "/etc/x11vnc.pass" mode: 0644 - - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" + - name: "(ubuntu-x11vnc-2004-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" template: - src: lib/systemd/system/x11vnc.service.j2 + src: lib/systemd/system/x11vnc-gdm3.service.j2 dest: /lib/systemd/system/x11vnc.service - - name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service" + - name: "(ubuntu-x11vnc-2004-amd64.yml) Enable service" systemd: name: x11vnc.service daemon_reload: yes enabled: yes state: restarted -# - name: "(ubuntu-x11vnc-1804-amd64.yml) Remove whisker menu entry for allusers (except owner and group)" +# - name: "(ubuntu-x11vnc-2004-amd64.yml) Remove whisker menu entry for allusers (except owner and group)" # file: # path: "/usr/share/applications/x11vnc.desktop" # mode: 0750 diff --git a/roles/common/templates/etc/samba/smb.conf.j2 b/roles/common/templates/etc/samba/smb.conf.j2 index d481e3b..29304e1 100644 --- a/roles/common/templates/etc/samba/smb.conf.j2 +++ b/roles/common/templates/etc/samba/smb.conf.j2 @@ -263,7 +263,7 @@ # By default, the home directories are exported read-only. Change the # next parameter to 'no' if you want to be able to write to them. - read only = yes + read only = no # File creation mask is set to 0700 for security reasons. If you want to # create files with group=rw permissions, set next parameter to 0775. diff --git a/roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2 b/roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2 new file mode 100644 index 0000000..c271560 --- /dev/null +++ b/roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2 @@ -0,0 +1,11 @@ +# {{ ansible_managed }} +[Unit] +Description=Start x11vnc at startup. +After=multi-user.target + +[Service] +Type=simple +ExecStart=/usr/bin/x11vnc -loop -forever -bg -rfbport 5900 -xkb -noxrecord -noxfixes -noxdamage -shared -norc -auth /run/user/{{ grp_id_gdm.stdout }}/gdm/Xauthority -rfbauth /etc/x11vnc.pass + +[Install] +WantedBy=multi-user.target