paramecio/pastafari2
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fixes in updates

Browse source
This commit is contained in:
absurdo 2023-06-09 01:05:33 +02:00
parent 55a1075c3a
commit 9161c35cac
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/pastafari2.py
View file

@ -39,8 +39,10 @@ class UpdateServerScripts(WebModel):
super().__init__(connection) super().__init__(connection)
self.register(corefields.CharField('name'), True) self.register(corefields.CharField('name'), True)
self.register(FileField('file', './scripts/local/'), 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.ForeignKeyField('server_id', ServerDbTask(connection), 11, False, 'id', 'group', select_fields=[]))
self.register(corefields.IntegerField('position')) self.register(corefields.IntegerField('position'))
self.register(corefields.CharField('code'))
class NameServerScripts(WebModel): class NameServerScripts(WebModel):

14
tasks/system/updates.py
View file

@ -17,11 +17,13 @@ class ServerTask(Task):
arr_server=serverdb.set_conditions('WHERE ip=%s', [server]).select_a_row_where() 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() update_server=UpdateServerScripts(conn)
for upd in arr_update:
self.files.append([upd['file'], 0o755]) arr_update=update_server.set_conditions('WHERE server_id=%s', [arr_server['id']]).select_to_array()
self.commands_to_execute.append([upd['file'], ''])
for upd in arr_update:
self.files.append([upd['file'], 0o755])
self.commands_to_execute.append([upd['file'], upd['args']])