Fixes in php delete
This commit is contained in:
parent
e403599bf5
commit
50204461ee
6 changed files with 197 additions and 71 deletions
10
dashboard.py
10
dashboard.py
|
|
@ -94,8 +94,12 @@ def delete_php(php_server_id):
|
|||
arr_server=cursor.fetchone()
|
||||
|
||||
if arr_server:
|
||||
|
||||
#select * from virtualhost, webserver, serverdbtask, phpserver where virtualhost.webserver_id=webserver.id AND serverdbtask.id=webserver.server_id AND phpserver.server_id=serverdbtask.id AND phpserver.id=19
|
||||
with db.query('select count(*) as num_php_vhosts from virtualhost, webserver, serverdbtask, phpserver where virtualhost.webserver_id=webserver.id AND serverdbtask.id=webserver.server_id AND phpserver.server_id=serverdbtask.id AND phpserver.id=%s', [php_server_id]) as cursor:
|
||||
num_php_vhosts=cursor.fetchone()['num_php_vhosts']
|
||||
|
||||
return t.load_template('del_phpserver.phtml', title=_('Remove PHP FPM server'), path_module='php_app.php_dashboard', php_server_id=php_server_id, domain=arr_server['hostname'])
|
||||
return t.load_template('del_phpserver.phtml', title=_('Remove PHP FPM server'), path_module='php_app.php_dashboard', php_server_id=php_server_id, domain=arr_server['hostname'], num_php_vhosts=num_php_vhosts)
|
||||
|
||||
abort(404)
|
||||
|
||||
|
|
@ -110,7 +114,7 @@ def delete_php_task(php_server_id):
|
|||
|
||||
error_form={}
|
||||
|
||||
with db.query('select serverdbtask.hostname, serverdbtask.ip, serverdbtask.ssh_port, phpserver.version from serverdbtask, phpserver where phpserver.server_id=serverdbtask.id') as cursor:
|
||||
with db.query('select serverdbtask.hostname, serverdbtask.ip, serverdbtask.ssh_port, phpserver.version from serverdbtask, phpserver where phpserver.server_id=serverdbtask.id and phpserver.id=%s', [php_server_id]) as cursor:
|
||||
arr_server=cursor.fetchone()
|
||||
|
||||
if arr_server:
|
||||
|
|
@ -127,7 +131,7 @@ def delete_php_task(php_server_id):
|
|||
#root_dir='/home/'+username+'/sites/'+domain
|
||||
|
||||
#ftp_user=arr_user['user']
|
||||
print('pep')
|
||||
|
||||
if not sshtask.run_task(arr_server['ip'], 'modules.phpserver.tasks.php.php.delete_php', 'Delete PHP server', 'delete_phpserver', 'Task for delete php-fpm server from server', {'version': arr_server['version'], 'php_server_id': php_server_id}, config_task.remote_user, '', '', url_for('php_app.php_dashboard'), ssh_key_priv=ssh_key_priv, ssh_key_password='', send_task=True, ssh_port=arr_server['ssh_port']):
|
||||
|
||||
error=1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue