From 7adb6dd1083420fa3bff20f3d58aa36d30e36e3c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 1 Mar 2024 15:33:46 +0100 Subject: [PATCH] Add/Remove users via API without script restart --- debian/changelog | 6 ++++++ omr-admin.py | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31561d2..a996a88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.9+20240301) unstable; urgency=medium + + * Add/Remove users via API without script restart + + -- OpenMPTCProuter Fri, 01 Mar 2024 15:32:17 +0200 + omr-vps-admin (0.9+20240222) unstable; urgency=medium * Use fd00 instead of fe80 for 6in4 diff --git a/omr-admin.py b/omr-admin.py index 60c7f71..6df4220 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -3149,7 +3149,11 @@ def add_user(*, params: NewUser, current_user: User = Depends(get_current_user)) add_dsvpn(userid) set_lastchange(30) - os.execv(__file__, sys.argv) + #os.execv(__file__, sys.argv) + with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json') as f: + global fake_users_db + omr_config_data = json.load(f) + fake_users_db = omr_config_data['users'][0] class RemoveUser(BaseModel): username: str @@ -3188,7 +3192,11 @@ def remove_user(*, params: RemoveUser, current_user: User = Depends(get_current_ if os.path.isfile('/etc/dsvpn/dsvpn0'): remove_dsvpn(userid) set_lastchange(30) - os.execv(__file__, sys.argv) + #os.execv(__file__, sys.argv) + with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json') as f: + global fake_users_db + omr_config_data = json.load(f) + fake_users_db = omr_config_data['users'][0] class ClienttoClient(BaseModel): enable: bool = False