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

Fixes in tasks and updates

Browse source
This commit is contained in:
absurdo 2023-11-27 01:38:54 +01:00
parent 9efdb38e0e
commit 8e693ae7b6
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
models/tasks.py
View file

@ -336,8 +336,9 @@ def task(task_id):
remote_password=arr_task['password'] remote_password=arr_task['password']
private_key=arr_task['ssh_key_priv'] private_key=arr_task['ssh_key_priv']
password_key=arr_task.get('ssh_key_password', '') password_key=arr_task.get('ssh_key_password', '')
port=arr_task.get('ssh_port', 22)
final_task=ssh_task.ServerTask(server, conn, remote_user=remote_user, remote_password=remote_password, private_key=private_key, password_key=password_key, remote_path='pastafari2', task_id=task_id, data=json.loads(arr_task['data'])) final_task=ssh_task.ServerTask(server, conn, remote_user=remote_user, remote_password=remote_password, private_key=private_key, password_key=password_key, remote_path='pastafari2', task_id=task_id, data=json.loads(arr_task['data']), port=port)
final_task.exec() final_task.exec()

9
scripts/system/updates.py
View file

@ -5,6 +5,7 @@
from subprocess import call from subprocess import call
from time import sleep from time import sleep
import distro import distro
import os
linux_distro=distro.id() linux_distro=distro.id()
@ -54,6 +55,14 @@ if call("sudo /usr/local/bin/composer self-update", shell=True) > 0:
print('Upgrading Pastafari utils...') print('Upgrading Pastafari utils...')
if not os.path.isdir('./leviathanutils'):
if call("git clone https://git.cuchulu.com/phangoapp/leviathanutils.git && composer install --working-dir=./leviathanutils", shell=True) > 0:
print('Error, cannot install leviathanutils...')
exit(1)
else:
if call("cd ./leviathanutils && git pull && composer update", shell=True) > 0: if call("cd ./leviathanutils && git pull && composer update", shell=True) > 0:
print('Error, cannot upgrade Leviathanutils...') print('Error, cannot upgrade Leviathanutils...')
exit(1) exit(1)