From 9161c35cacafa7fbc2130f4fd6e1dcef9227658e Mon Sep 17 00:00:00 2001 From: absurdo Date: Fri, 9 Jun 2023 01:05:33 +0200 Subject: [PATCH] Fixes in updates --- models/pastafari2.py | 2 ++ tasks/system/updates.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/models/pastafari2.py b/models/pastafari2.py index 6386bed..c8c1ba2 100644 --- a/models/pastafari2.py +++ b/models/pastafari2.py @@ -39,8 +39,10 @@ class UpdateServerScripts(WebModel): super().__init__(connection) self.register(corefields.CharField('name'), True) self.register(FileField('file', './scripts/local/'), True) + self.register(corefields.CharField('args')) self.register(corefields.ForeignKeyField('server_id', ServerDbTask(connection), 11, False, 'id', 'group', select_fields=[])) self.register(corefields.IntegerField('position')) + self.register(corefields.CharField('code')) class NameServerScripts(WebModel): diff --git a/tasks/system/updates.py b/tasks/system/updates.py index 1b83230..bef670b 100644 --- a/tasks/system/updates.py +++ b/tasks/system/updates.py @@ -17,11 +17,13 @@ class ServerTask(Task): arr_server=serverdb.set_conditions('WHERE ip=%s', [server]).select_a_row_where() - update_server=UpdateServerScripts(conn) + if arr_server: - arr_update=update_server.set_conditions('WHERE server_id=%s', [arr_server['id']]).select_to_array() - - for upd in arr_update: + update_server=UpdateServerScripts(conn) - self.files.append([upd['file'], 0o755]) - self.commands_to_execute.append([upd['file'], '']) + arr_update=update_server.set_conditions('WHERE server_id=%s', [arr_server['id']]).select_to_array() + + for upd in arr_update: + + self.files.append([upd['file'], 0o755]) + self.commands_to_execute.append([upd['file'], upd['args']])