pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mainusers only in newservers

This commit is contained in:
jorgepastorr 2023-07-21 18:26:42 +02:00
parent 889714778d
commit 24956867f0
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
orchestra/contrib/systemusers/backends.py
View File

@ -538,37 +538,38 @@ class UNIXUserControllerNewServers(ServiceController):
""") % context """) % context
) )
for member in settings.SYSTEMUSERS_DEFAULT_GROUP_MEMBERS: for member in settings.SYSTEMUSERS_DEFAULT_GROUP_MEMBERS:
context['member'] = member context['member'] = member
self.append('usermod -a -G %(user)s %(member)s || exit_code=$?' % context) self.append('usermod -a -G %(user)s %(member)s || exit_code=$?' % context)
if not user.is_main:
self.append('usermod -a -G %(user)s %(mainuser)s || exit_code=$?' % context)
def delete(self, user): def delete(self, user):
context = self.get_context(user) context = self.get_context(user)
if not context['user']: if not context['user']:
return return
self.append(textwrap.dedent(""" if user.is_main:
# Delete %(user)s user
nohup bash -c 'sleep 2 && killall -u %(user)s -s KILL' &> /dev/null &
killall -u %(user)s || true
userdel %(user)s || exit_code=$?
groupdel %(group)s || exit_code=$?\
""") % context
)
if context['deleted_home']:
self.append(textwrap.dedent("""\ self.append(textwrap.dedent("""\
# Move home into SYSTEMUSERS_MOVE_ON_DELETE_PATH, nesting if exists. # Delete %(user)s user
deleted_home="%(deleted_home)s" nohup bash -c 'sleep 2 && killall -u %(user)s -s KILL' &> /dev/null &
while [[ -e "$deleted_home" ]]; do killall -u %(user)s || true
deleted_home="${deleted_home}/$(basename ${deleted_home})" userdel %(user)s || exit_code=$?
done groupdel %(group)s || exit_code=$?
mv '%(base_home)s' "$deleted_home" || exit_code=$?
""") % context """) % context
) )
else: if context['deleted_home']:
self.append("rm -fr -- '%(base_home)s'" % context) self.append(textwrap.dedent("""\
# Move home into SYSTEMUSERS_MOVE_ON_DELETE_PATH, nesting if exists.
deleted_home="%(deleted_home)s"
while [[ -e "$deleted_home" ]]; do
deleted_home="${deleted_home}/$(basename ${deleted_home})"
done
mv '%(base_home)s' "$deleted_home" || exit_code=$?
""") % context
)
else:
self.append("rm -fr -- '%(base_home)s'" % context)
# TODO: comprovar funciones que no se suelen utilizar
def grant_permissions(self, user, context): def grant_permissions(self, user, context):
context['perms'] = user.set_perm_perms context['perms'] = user.set_perm_perms
# Capital X adds execution permissions for directories, not files # Capital X adds execution permissions for directories, not files
@ -680,12 +681,12 @@ class UNIXUserControllerNewServers(ServiceController):
) )
def get_groups(self, user): def get_groups(self, user):
groups = []
if user.is_main: if user.is_main:
groups = list(user.account.systemusers.exclude(username=user.username).values_list('username', flat=True)) groups = list(user.account.systemusers.exclude(username=user.username).values_list('username', flat=True))
groups.append("main-systemusers") groups.append("main-systemusers")
return groups # groups = list(user.groups.values_list('username', flat=True))
groups = list(user.groups.values_list('username', flat=True)) # groups.append("webapp-systemusers")
groups.append("webapp-systemusers")
return groups return groups
def get_context(self, user): def get_context(self, user):