From c5d17d3fd1bbdca95dd9230a2ab54f5aef04aef8 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Fri, 22 Jul 2011 13:48:47 +0000 Subject: [PATCH] Bugfixes in server list in vm server forms. --- interface/web/vm/form/openvz_ip.tform.php | 2 +- interface/web/vm/form/openvz_ostemplate.tform.php | 2 +- interface/web/vm/form/openvz_vm.tform.php | 2 +- server/plugins-available/openvz_plugin.inc.php | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/web/vm/form/openvz_ip.tform.php b/interface/web/vm/form/openvz_ip.tform.php index ced86746c..78b9d944a 100644 --- a/interface/web/vm/form/openvz_ip.tform.php +++ b/interface/web/vm/form/openvz_ip.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['main'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/vm/form/openvz_ostemplate.tform.php b/interface/web/vm/form/openvz_ostemplate.tform.php index 279a9a5de..6b9be3f3e 100644 --- a/interface/web/vm/form/openvz_ostemplate.tform.php +++ b/interface/web/vm/form/openvz_ostemplate.tform.php @@ -85,7 +85,7 @@ $form["tabs"]['main'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/interface/web/vm/form/openvz_vm.tform.php b/interface/web/vm/form/openvz_vm.tform.php index 75b36c1ca..0077ef28d 100644 --- a/interface/web/vm/form/openvz_vm.tform.php +++ b/interface/web/vm/form/openvz_vm.tform.php @@ -63,7 +63,7 @@ $form["tabs"]['main'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name', 'keyfield'=> 'server_id', 'valuefield'=> 'server_name' ), diff --git a/server/plugins-available/openvz_plugin.inc.php b/server/plugins-available/openvz_plugin.inc.php index e14c0c4c9..ac9e0aaa0 100644 --- a/server/plugins-available/openvz_plugin.inc.php +++ b/server/plugins-available/openvz_plugin.inc.php @@ -143,6 +143,7 @@ class openvz_plugin { return; } + exec("vzctl stop $veid"); exec("vzctl destroy $veid"); $app->log("Destroying OpenVZ VM: vzctl destroy $veid",LOGLEVEL_DEBUG); -- GitLab