From cb0437a358362e07cbb804149321eb48d8af52c9 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 3 May 2021 16:09:43 +0200 Subject: [PATCH] Update.. --- group_vars/all/main.yml | 83 ++++++++++++------- hosts | 4 + .../.config/autostart/x11vnc.desktop | 2 +- 3 files changed, 60 insertions(+), 29 deletions(-) diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index e471084..9bcf996 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -890,6 +890,7 @@ nis_user: groups: - all-users - regishut + - regishut-personal-finanzen - buero-scan is_samba_user: true password: 'SHUT_20_s3nc3!' @@ -952,6 +953,13 @@ nis_user: - bmb is_samba_user: true password: '73_BiBole_29' + - name: bianca.loy + groups: + - all-users + - mbr-buero + - buero-scan + is_samba_user: true + password: 'ctnrk3CczcJ9' - name: birgit.erhardt groups: - all-users @@ -1030,6 +1038,26 @@ nis_user: - buero-scan is_samba_user: true password: 'TFhCW9J4Vn4F' + - name: honorar.mbr1 + groups: + - all-users + - mbr-buero + - buero-scan + is_samba_user: true + password: '_F313r4b3nd*' + - name: honorar.rias1 + groups: + - all-users + - mbr-buero + - buero-scan + is_samba_user: true + password: '6jA,nmD,fdK!' + - name: isabella.greif + groups: + - mbr-buero + - buero-scan + is_samba_user: true + password: '5zv-Bo2.Cio9' - name: isabell.wiesner groups: - all-users @@ -1053,6 +1081,8 @@ nis_user: groups: - all-users - mbr-buero + - mbr-finanzen + - mbr-personal - buero-scan is_samba_user: true password: 'LoS_r3f_20_AS!' @@ -1115,6 +1145,15 @@ nis_user: - buero-scan is_samba_user: true password: 'Rasili_&n' + - name: marc.schwietring + groups: + - all-users + - mbr-buero + - buero-scan + - regishut + - regishut-personal-finanzen + is_samba_user: true + password: '69UnNr-g.ZuQ' - name: mathias groups: - all-users @@ -1137,20 +1176,6 @@ nis_user: - 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 @@ -1158,6 +1183,13 @@ nis_user: - buero-scan is_samba_user: true password: 'BMW_mobit_2020!' + - name: pia.lamberty + groups: + - all-users + - mbr-buero + - buero-scan + is_samba_user: true + password: 'oasd31*as+Q%' - name: pierre.ahrent groups: - all-users @@ -1193,13 +1225,6 @@ nis_user: - 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 @@ -1207,13 +1232,6 @@ nis_user: - 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 @@ -1325,6 +1343,7 @@ samba_shares: - christina.wendt - chris - isabell.wiesner + - janine.budich - sysadm - name: Ausschreibungen path: /data/shares/Ausschreibungen @@ -1339,6 +1358,7 @@ samba_shares: - bianca - chris - matthias.mueller + - janine.budich - sysadm - name: BGN-Finanzen-Personal path: /data/shares/BGN-Finanzen-Personal @@ -1406,6 +1426,7 @@ samba_shares: - lena.mahler - linda.giesel - manja.kasten + - marc.schwietring - mathias - matthias.mueller - michael.sulies @@ -1490,6 +1511,7 @@ samba_shares: - christina.wendt - chris - isabell.wiesner + - janine.budich - sysadm - name: Install path: /data/shares/Install @@ -1537,6 +1559,7 @@ samba_shares: - dorina.feldmann - felix.mueller - hamid.mohseni + - isabella.greif - isabell.wiesner - janine.budich - johannes.radke @@ -1631,6 +1654,7 @@ samba_shares: - christina.wendt - isabell.wiesner - linda.giesel + - marc.schwietring - name: Regishut-Personal-Finanzen path: /data/shares/Regishut-Personal-Finanzen group_valid_users: regishut-personal-finanzen @@ -1645,6 +1669,7 @@ samba_shares: - christina.wendt - isabell.wiesner - linda.giesel + - marc.schwietring - name: RIAS path: /data/shares/RIAS group_valid_users: mbr-buero @@ -1739,6 +1764,7 @@ samba_shares: - dorina.feldmann - felix.mueller - hamid.mohseni + - isabella.greif - isabell.wiesner - janine.budich - johannes.radke @@ -1842,6 +1868,7 @@ samba_shares: - dorina.feldmann - felix.mueller - hamid.mohseni + - isabella.greif - isabell.wiesner - janine.budich - johannes.radke diff --git a/hosts b/hosts index d101929..18158b2 100644 --- a/hosts +++ b/hosts @@ -1,6 +1,7 @@ [initial_setup] file-mbr.mbr-bln.netz ansible_user=root +file-kb.anw-kb.netz ansible_user=root pc101.mbr-bln.netz pc102.mbr-bln.netz pc103.mbr-bln.netz @@ -102,15 +103,18 @@ pc127.mbr-bln.netz [file_server] file-mbr.mbr-bln.netz ansible_user=root +file-kb.anw-kb.netz ansible_user=root [nfs_server] file-mbr.mbr-bln.netz ansible_user=root +file-kb.anw-kb.netz ansible_user=root [nis_server] file-mbr.mbr-bln.netz ansible_user=root [samba_server] file-mbr.mbr-bln.netz ansible_user=root +file-kb.anw-kb.netz ansible_user=root [ftp_server] diff --git a/roles/common/files/USER_HOME/.config/autostart/x11vnc.desktop b/roles/common/files/USER_HOME/.config/autostart/x11vnc.desktop index 4814b2d..21ec166 100644 --- a/roles/common/files/USER_HOME/.config/autostart/x11vnc.desktop +++ b/roles/common/files/USER_HOME/.config/autostart/x11vnc.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=x11vnc -rfbport -rfbauth /etc/x11vnc.pass +Exec=x11vnc -rfbport 5901 -rfbauth /etc/x11vnc.pass Hidden=false NoDisplay=false X-GNOME-Autostart-enabled=true