From d87f76019fc231ec20d95126a7fee0487e7be5f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 14 Aug 2012 10:56:20 -0400
Subject: [PATCH] - Added new web folder named private to web folder layout. The folder is intended to store data that shall not be visible in the web directory, it is owned by the user of the web. - Changed ownership of web root directory to root user in all security modes to prevent symlink attacks. - Apache log files are now owned by user root. - Improved functions in system library.
---
interface/lib/plugins/vm_openvz_plugin.inc.php | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php
index 1112e08..42a6530 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -23,6 +23,7 @@
//* Register for events
$app->plugin->registerEvent('vm:openvz_vm:on_after_insert','vm_openvz_plugin','openvz_vm_insert');
$app->plugin->registerEvent('vm:openvz_vm:on_after_update','vm_openvz_plugin','openvz_vm_update');
+ $app->plugin->registerEvent('vm:openvz_vm:on_after_delete','vm_openvz_plugin','openvz_vm_delete');
}
/*
@@ -105,6 +106,16 @@
}
+ function openvz_vm_delete($event_name, $page_form) {
+ global $app, $conf;
+
+ //* Free the IP address
+ $tmp = $app->db->queryOneRecord("SELECT ip_address_id FROM openvz_ip WHERE vm_id = ".$page_form->id);
+ $app->db->datalogUpdate('openvz_ip', 'vm_id = 0', 'ip_address_id', $tmp['ip_address_id']);
+ unset($tmp);
+
+ }
+
private function applyTemplate() {
global $app, $conf;
@@ -129,13 +140,14 @@
private function makeOpenVZConfig() {
global $app, $conf;
- $vm = $app->tform->getDataRecord($this->id);
+ $vm = $app->db->queryOneRecord("SELECT * FROM openvz_vm WHERE vm_id = ".$this->id);
$vm_template = $app->db->queryOneRecord("SELECT * FROM openvz_template WHERE template_id = ".$vm['template_id']);
$burst_ram = $vm['ram_burst']*256;
$guar_ram = $vm['ram']*256;
+ $app->load('tpl');
$tpl = new tpl();
- $tpl->newTemplate('templates/openvz.conf.tpl');
+ $tpl->newTemplate('../vm/templates/openvz.conf.tpl');
$onboot = ($vm['start_boot'] == 'y')?'yes':'no';
$tpl->setVar('onboot',$onboot);
@@ -161,6 +173,7 @@
$tpl->setVar('numfile',$vm_template['numfile']);
$tpl->setVar('avnumproc',$vm_template['avnumproc']);
$tpl->setVar('numiptent',$vm_template['numiptent']);
+ $tpl->setVar('swappages',$vm_template['swappages']);
$diskspace = $vm['diskspace']*1048576;
$diskinodes = $vm['diskspace']*524288;
@@ -194,7 +207,7 @@
private function createDNS() {
global $app, $conf;
- $vm = $app->tform->getDataRecord($this->id);
+ $vm = $app->db->queryOneRecord("SELECT * FROM openvz_vm WHERE vm_id = ".$this->id);
if($vm['create_dns'] != 'y') return;
--
Gitblit v1.9.1