diff --git a/admin/dashboard.py b/admin/dashboard.py index 6762e84..ac8d2f5 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -101,7 +101,7 @@ def pastafari2_dashboard(): if config.reloader: reload(ptask) - task_first=ptask.ServerTask('', db, remote_user='root', remote_password='', private_key='./ssh/id_rsa', password_key='', remote_path='pastafari2', task_id=0, data=dict(request.args)) + task_first=ptask.ServerTask('', db, remote_user='root', remote_password='', private_key=system_path+'id_rsa', password_key='', remote_path='pastafari2', task_id=0, data=dict(request.args)) links=task_first.links @@ -212,8 +212,8 @@ def pastafari2_add_server_task(): server_password=request.form.get('server_password', '') repeat_server_password=request.form.get('repeat_server_password', '') group_id=request.form.get('group_id', '') - private_key='./ssh/id_rsa' - public_key='./ssh/id_rsa.pub' + private_key=system_path+'id_rsa' + public_key=system_path+'id_rsa.pub' remote_path='pastafari2' task_id=0 ip='' @@ -476,7 +476,7 @@ def pastafari2_update_task(): user=config_task.remote_user - ssh_key_priv='./ssh/id_rsa' + ssh_key_priv=system_path+'id_rsa' if not task.run_task(server_host, path_task, 'Update server', 'update_server', 'Task for update servers', user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url='', data=data, send_task=True): @@ -509,7 +509,7 @@ def pastafari2_make_task(): if config.reloader: reload(task_execute) - task_first=task_execute.ServerTask('', db, remote_user='root', remote_password='', private_key='./ssh/id_rsa', password_key='', remote_path='pastafari2', task_id=0, data=dict(request.args)) + task_first=task_execute.ServerTask('', db, remote_user='root', remote_password='', private_key=system_path+'id_rsa', password_key='', remote_path='pastafari2', task_id=0, data=dict(request.args)) send_task=request.args.get('send_task', '') @@ -580,7 +580,7 @@ def pastafari2_make_task(): user=config_task.remote_user - ssh_key_priv='./ssh/id_rsa' + ssh_key_priv=system_path+'id_rsa' if not task.run_task(server_host, path_task, task_first.name_task, task_first.codename_task, task_first.description_task, user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url=task_first.url_return, data=data, send_task=True): @@ -740,9 +740,8 @@ def pre_update_server(admin): ssh_user=config_task.remote_user ssh_port=request.form.get('ssh_port', 22) server_host=request.form.get('ip', '') - private_key='./ssh/id_rsa' - private_key='./ssh/id_rsa' - public_key='./ssh/id_rsa.pub' + private_key=system_path+'id_rsa' + public_key=system_path+'id_rsa.pub' remote_path='pastafari2' data={} task_id=0