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

Fixes in more quit monit dependencies

Browse source
This commit is contained in:
absurdo 2023-09-03 00:47:06 +02:00
parent 65111f67ae
commit e4905c9769
4 changed files with 157 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

36
admin/dashboard.py
View file

@ -224,7 +224,7 @@ def pastafari2_add_server_task():
except:
pass
ssh_port='22'
#make ping to server
@ -232,6 +232,10 @@ def pastafari2_add_server_task():
if server_host=='':
error=1
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_hostname', 'Error: you need enter a valid hostname')
if server_username=='':
error=1
error_form['#server_username_error']=I18n.lang('pastafari2', 'error_username', 'Error: you need enter a valid username for the server')
txt_error=''
@ -252,7 +256,9 @@ def pastafari2_add_server_task():
arr_group=server_group.set_conditions('WHERE id=%s', [group_id]).select_a_row_where()
group_name=arr_group['code_group']
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}
# 'url_stats': config.domain_url+url_for('monit_app.monit_get_data', api_key=config.monit_api_key)
data={'ssh_user': ssh_user, 'pub_key': public_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, port=ssh_port) as ssh_task:
if not ssh_task.prepare_connection():
@ -263,19 +269,19 @@ def pastafari2_add_server_task():
# Prepare task for install monit
pass
task=Task(db)
task_id=0
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, 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)
txt_error=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task '+task.txt_error)
task_id=task.task_id
task=Task(db)
task_id=0
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, 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)
txt_error=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task '+task.txt_error)
task_id=task.task_id
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}