update ..

This commit is contained in:
Christoph 2021-06-09 23:36:44 +02:00
parent e2cc27a260
commit 16b542703a
8 changed files with 41 additions and 24 deletions

View File

@ -10,13 +10,7 @@
[defaults] [defaults]
#ansible_managed = ** Ansible managed: DO NOT EDIT DIRECTLY ** ansible_managed = *** [ Ansible managed: DO NOT EDIT DIRECTLY ] ***
ansible_managed = ############################################ #
# -------------------------- #
# ** DO NOT EDIT DIRECTLY ** #
# -------------------------- #
# Ansible managed file #
# ############################################ #
#gathering = smart #gathering = smart
#fact_caching = jsonfile #fact_caching = jsonfile
#fact_caching_connection = ~/.cache/ #fact_caching_connection = ~/.cache/

View File

@ -558,7 +558,7 @@ microcode_amd_package:
- amd64-microcode - amd64-microcode
firmware_packages_ubuntu: firmware_packages_ubuntu:
- firmware-linux - linux-firmware
firmware_packages_debian: firmware_packages_debian:
- firmware-linux - firmware-linux

4
hosts
View File

@ -25,6 +25,7 @@ pc124.mbr-bln.netz
pc125.mbr-bln.netz pc125.mbr-bln.netz
pc126.mbr-bln.netz pc126.mbr-bln.netz
pc127.mbr-bln.netz pc127.mbr-bln.netz
pc135.mbr-bln.netz
[client_pc] [client_pc]
pc101.mbr-bln.netz pc101.mbr-bln.netz
@ -50,6 +51,7 @@ pc124.mbr-bln.netz
pc125.mbr-bln.netz pc125.mbr-bln.netz
pc126.mbr-bln.netz pc126.mbr-bln.netz
pc127.mbr-bln.netz pc127.mbr-bln.netz
pc135.mbr-bln.netz
[nfs_client] [nfs_client]
pc101.mbr-bln.netz pc101.mbr-bln.netz
@ -75,6 +77,7 @@ pc124.mbr-bln.netz
pc125.mbr-bln.netz pc125.mbr-bln.netz
pc126.mbr-bln.netz pc126.mbr-bln.netz
pc127.mbr-bln.netz pc127.mbr-bln.netz
pc135.mbr-bln.netz
[nis_client] [nis_client]
pc101.mbr-bln.netz pc101.mbr-bln.netz
@ -100,6 +103,7 @@ pc124.mbr-bln.netz
pc125.mbr-bln.netz pc125.mbr-bln.netz
pc126.mbr-bln.netz pc126.mbr-bln.netz
pc127.mbr-bln.netz pc127.mbr-bln.netz
pc135.mbr-bln.netz
[file_server] [file_server]
file-mbr.mbr-bln.netz ansible_user=root file-mbr.mbr-bln.netz ansible_user=root

View File

@ -239,8 +239,8 @@
- name: "Configure LUKS" #- name: "Configure LUKS"
import_tasks: luks.yml # import_tasks: luks.yml
when: "groups['client_pc']|string is search(inventory_hostname)" # when: "groups['client_pc']|string is search(inventory_hostname)"
tags: # tags:
- luks # - luks

View File

@ -18,7 +18,11 @@
state: present state: present
vars: vars:
packages: 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" - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password"
raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass" 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" - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
template: template:
src: lib/systemd/system/x11vnc.service.j2 src: lib/systemd/system/x11vnc-gdm3.service.j2
dest: /lib/systemd/system/x11vnc.service dest: /lib/systemd/system/x11vnc.service
- name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service" - name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service"

View File

@ -11,36 +11,40 @@
# Source: # Source:
# - http://c-nergy.be/blog/?p=8984 # - http://c-nergy.be/blog/?p=8984
- name: "(ubuntu-x11vnc-1804-amd64.yml) Install packages" - name: "(ubuntu-x11vnc-2004-amd64.yml) Install packages"
apt: apt:
name: "{{ packages }}" name: "{{ packages }}"
update_cache: yes update_cache: yes
state: present state: present
vars: vars:
packages: 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" 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: file:
path: "/etc/x11vnc.pass" path: "/etc/x11vnc.pass"
mode: 0644 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: template:
src: lib/systemd/system/x11vnc.service.j2 src: lib/systemd/system/x11vnc-gdm3.service.j2
dest: /lib/systemd/system/x11vnc.service dest: /lib/systemd/system/x11vnc.service
- name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service" - name: "(ubuntu-x11vnc-2004-amd64.yml) Enable service"
systemd: systemd:
name: x11vnc.service name: x11vnc.service
daemon_reload: yes daemon_reload: yes
enabled: yes enabled: yes
state: restarted 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: # file:
# path: "/usr/share/applications/x11vnc.desktop" # path: "/usr/share/applications/x11vnc.desktop"
# mode: 0750 # mode: 0750

View File

@ -263,7 +263,7 @@
# By default, the home directories are exported read-only. Change the # 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. # 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 # 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. # create files with group=rw permissions, set next parameter to 0775.

View File

@ -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