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

Fixes for support change port and changes for no install monit for default

Browse source
This commit is contained in:
absurdo 2023-08-02 01:11:21 +02:00
parent 2ebe22f79e
commit 7c1b903d44
11 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
admin/dashboard.py
View file

@ -214,6 +214,18 @@ def pastafari2_add_server_task():
error=0
data={}
ssh_user=config_task.remote_user
ssh_port=config_task.port
try:
tmp_port=int(request.form.get('ssh_port', '22'))
ssh_port=tmp_port
except:
pass
#make ping to server
@ -242,7 +254,7 @@ def pastafari2_add_server_task():
data={'ssh_user': ssh_user, 'pub_key': public_key, 'url_stats': config.domain_url+url_for('monit_app.monit_get_data', api_key=config.monit_api_key), 'hostname': server_host, 'ip': ip, 'group_id': group_id, 'group_name': group_name}
with SSHTask(server_host, db, remote_user=server_username, remote_password=server_password, private_key=private_key, remote_path=remote_path, task_id=task_id, data=data) as ssh_task:
with SSHTask(server_host, db, remote_user=server_username, remote_password=server_password, private_key=private_key, remote_path=remote_path, task_id=task_id, data=data, port=ssh_port) as ssh_task:
if not ssh_task.prepare_connection():
error=1
txt_error=I18n.lang('pastafari2', 'error_connection', 'Error: cannot connect to server')
@ -257,7 +269,7 @@ def pastafari2_add_server_task():
path_task='modules.pastafari2.tasks.system.task'
if not task.run_task(ip, path_task, 'Add new server', 'add_new_server', 'Task for add a new server', user=server_username, password=server_password, where_sql_server='', url='', data=data, send_task=True):
if not task.run_task(ip, path_task, 'Add new server', 'add_new_server', 'Task for add a new server', user=server_username, password=server_password, where_sql_server='', url='', data=data, send_task=True, ssh_port=ssh_port):
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task '+task.txt_error)