it-team/lmn-client
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: it-team:673449026e89d257a03791a9b1660f6e693ee966
Branches Tags
it-team:main
it-team:bookworm
it-team:dev
it-team:fvs
...
compare: it-team:7ddc8cc12fee3f74d5837c39f0749a2205042f2b
Branches Tags
it-team:main
it-team:bookworm
it-team:dev
it-team:fvs

2 commits
673449026e ... 7ddc8cc12f

Author SHA1 Message Date
Raphael Dannecker
7ddc8cc12f Due to new media tables, the audio output on some devices has changed 2025-09-22 13:23:34 +02:00
Raphael Dannecker
a78c04d098 No longer output error messages from the vminfo script to stdout 
The error messages were corrupting the contents of the .vminfo.json file.
Error messages are now sent to stderr.
 2025-09-22 13:17:57 +02:00
2 changed files with 658 additions and 670 deletions
Show stats Expand all files Collapse all files

1317
inventory.yml
View file

File diff suppressed because it is too large Load diff

11
roles/lmn_vm/files/vm-vminfo
View file

@ -4,6 +4,7 @@ import argparse
import struct import struct
import subprocess import subprocess
import json import json
import sys
from os import environ,path from os import environ,path
from impacket.krb5.ccache import CCache from impacket.krb5.ccache import CCache
@ -25,7 +26,7 @@ def get_printers():
printers.append(printer) printers.append(printer)
return printers return printers
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print(f"Fehler beim Abrufen der Drucker: {e}") sys.stderr.write(f"Fehler beim Abrufen der Drucker: {e}")
return [] return []
def get_groups(username): def get_groups(username):
@ -34,7 +35,7 @@ def get_groups(username):
groups = result.stdout.strip().split('\0') groups = result.stdout.strip().split('\0')
return groups return groups
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print(f"Fehler beim Abrufen der Gruppen: {e}") sys.stderr.write(f"Fehler beim Abrufen der Gruppen: {e}")
return [] return []
def get_krb5 (): def get_krb5 ():
@ -50,7 +51,7 @@ def get_krb5 ():
krb5['endtime'] = ccache.credentials[0]['time']['endtime'] krb5['endtime'] = ccache.credentials[0]['time']['endtime']
krb5['renew_till'] = ccache.credentials[0]['time']['renew_till'] krb5['renew_till'] = ccache.credentials[0]['time']['renew_till']
except: except:
print("Fehler beim Ticket laden") sys.stderr.write("Fehler beim Ticket laden")
return krb5 return krb5
def get_mounts(): def get_mounts():
@ -96,7 +97,7 @@ def main():
nethome = f"/srv/samba/schools/default-school/teachers/{vminfo['User']}" nethome = f"/srv/samba/schools/default-school/teachers/{vminfo['User']}"
else: else:
result = subprocess.run(['find', '/srv/samba/schools/default-school/students/', '-name', vminfo['User'], '-maxdepth', '2', '-type', 'd'], capture_output=True, text=True, check=False) result = subprocess.run(['find', '/srv/samba/schools/default-school/students/', '-name', vminfo['User'], '-maxdepth', '2', '-type', 'd'], capture_output=True, text=True, check=False)
nethome = result.stdout nethome = result.stdout.splitlines()[0]
vminfo['Printers'] = get_printers() vminfo['Printers'] = get_printers()
vminfo['krb5'] = get_krb5() vminfo['krb5'] = get_krb5()
@ -105,7 +106,7 @@ def main():
vminfo['QuickAccess'] = get_quickaccess() vminfo['QuickAccess'] = get_quickaccess()
vminfo_json = json.dumps(vminfo, ensure_ascii=False, indent=4) vminfo_json = json.dumps(vminfo, ensure_ascii=False, indent=4)
print(vminfo_json) print(vminfo_json)
if __name__ == '__main__': if __name__ == '__main__':
main() main()