Skip to content

GitLab

Commit ca069831 authored by Florian Schaal's avatar Florian Schaal
Browse files

FS#1990 - Additional V-Server Field - this commits add a custom-field for openvz-configs

parent 61e08e76
Hide whitespace changes
Inline Side-by-side
install/sql/incremental/upd_dev_collection.sql
View file @ ca069831
......@@ -168,3 +168,7 @@ CREATE TABLE `server_ip_map` (
ALTER TABLE `web_domain` ADD COLUMN `rewrite_to_https` ENUM('y','n') NOT NULL DEFAULT 'n' AFTER `seo_redirect`;
ALTER TABLE openvz_ip ADD COLUMN `additional` VARCHAR(255) NOT NULL DEFAULT 'n';
ALTER TABLE openvz_template ADD COLUMN `custom` text;
ALTER TABLE openvz_vm ADD COLUMN `custom` text;
install/sql/ispconfig3.sql
View file @ ca069831
......@@ -1093,6 +1093,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
`capability` varchar(255) DEFAULT NULL,
`features` varchar(255) DEFAULT NULL,
`iptables` varchar(255) DEFAULT NULL,
`custom` text,
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
......@@ -1100,7 +1101,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
-- Dumping data for table `openvz_template`
--
INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `diskspace`, `traffic`, `bandwidth`, `ram`, `ram_burst`, `cpu_units`, `cpu_num`, `cpu_limit`, `io_priority`, `active`, `description`, `numproc`, `numtcpsock`, `numothersock`, `vmguarpages`, `kmemsize`, `tcpsndbuf`, `tcprcvbuf`, `othersockbuf`, `dgramrcvbuf`, `oomguarpages`, `privvmpages`, `lockedpages`, `shmpages`, `physpages`, `numfile`, `avnumproc`, `numflock`, `numpty`, `numsiginfo`, `dcachesize`, `numiptent`, `swappages`, `hostname`, `nameserver`, `create_dns`, `capability`, `features`, `iptables`) VALUES(1, 1, 1, 'riud', 'riud', '', 'small', 10, -1, -1, 256, 512, 1000, 4, 400, 4, 'y', '', '999999:999999', '7999992:7999992', '7999992:7999992', '65536:65536', '2147483646:2147483646', '214748160:396774400', '214748160:396774400', '214748160:396774400', '214748160:396774400', '65536:65536', '131072:131072', '999999:999999', '65536:65536', '0:2147483647', '23999976:23999976', '180:180', '999999:999999', '500000:500000', '999999:999999', '2147483646:2147483646', '999999:999999', '256000:256000', 'v{VEID}.test.tld', '8.8.8.8 8.8.4.4', 'n', '', '', '');
INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `diskspace`, `traffic`, `bandwidth`, `ram`, `ram_burst`, `cpu_units`, `cpu_num`, `cpu_limit`, `io_priority`, `active`, `description`, `numproc`, `numtcpsock`, `numothersock`, `vmguarpages`, `kmemsize`, `tcpsndbuf`, `tcprcvbuf`, `othersockbuf`, `dgramrcvbuf`, `oomguarpages`, `privvmpages`, `lockedpages`, `shmpages`, `physpages`, `numfile`, `avnumproc`, `numflock`, `numpty`, `numsiginfo`, `dcachesize`, `numiptent`, `swappages`, `hostname`, `nameserver`, `create_dns`, `capability`, `features`, `iptables`) VALUES(1, 1, 1, 'riud', 'riud', '', 'small', 10, -1, -1, 256, 512, 1000, 4, 400, 4, 'y', '', '999999:999999', '7999992:7999992', '7999992:7999992', '65536:65536', '2147483646:2147483646', '214748160:396774400', '214748160:396774400', '214748160:396774400', '214748160:396774400', '65536:65536', '131072:131072', '999999:999999', '65536:65536', '0:2147483647', '23999976:23999976', '180:180', '999999:999999', '500000:500000', '999999:999999', '2147483646:2147483646', '999999:999999', '256000:256000', 'v{VEID}.test.tld', '8.8.8.8 8.8.4.4', 'n', '', '', '', '');
-- --------------------------------------------------------
......@@ -1159,6 +1160,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
`features` text,
`iptabless` text,
`config` mediumtext,
`custom` text,
PRIMARY KEY (`vm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
......
interface/lib/classes/validate_openvz.inc.php 0 → 100644
View file @ ca069831
<?php
/**
Copyright (c) 2015, Florian Schaal, schaal @it
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@author Florian Schaal, info@schaal-24.de
@copyrighth Florian Schaal, info@schaal-24.de
*/
class validate_openvz {
function get_error($errmsg, $additional='') {
global $app;
if(isset($app->tform->wordbook[$errmsg])) {
return $app->tform->wordbook[$errmsg].$additional."<br>\r\n";
} else {
return $errmsg."<br>".$additional."<br>\r\n";
}
}
function check_custom($field_name, $field_value, $validator) {
$template = file('../vm/templates/openvz.conf.tpl', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
$custom_array = explode("\n", $field_value);
$used_parameters = array();
foreach ($template as $line) {
$line = trim ($line);
if (preg_match('/^[^#].*=\".*\"/', $line)) {
$line = explode('=', $line, 2);
$used_parameters[] = $line[0];
}
}
foreach ($custom_array as $check) {
$check = trim(strtoupper($check));
$check = explode('=', trim($check), 2);
$check = trim($check[0]);
if (in_array($check, $used_parameters)) {
return $this->get_error($validator['errmsg'], $check);
}
}
}
}
interface/lib/plugins/vm_openvz_plugin.inc.php
View file @ ca069831
......@@ -156,8 +156,9 @@ class vm_openvz_plugin {
$sql .= "capability = ?, ";
$sql .= "features = ?, ";
$sql .= "iptables = ? ";
$sql .= "custom = ? ";
$sql .= "WHERE vm_id = ?";
$app->db->query($sql, $tpl['diskspace'], $tpl['ram'], $tpl['ram_burst'], $tpl['cpu_units'], $tpl['cpu_num'], $tpl['cpu_limit'], $tpl['io_priority'], $tpl['nameserver'], $tpl['create_dns'], $tpl['capability'], $tpl['features'], $tpl['iptables'], $this->id);
$app->db->query($sql, $tpl['diskspace'], $tpl['ram'], $tpl['ram_burst'], $tpl['cpu_units'], $tpl['cpu_num'], $tpl['cpu_limit'], $tpl['io_priority'], $tpl['nameserver'], $tpl['create_dns'], $tpl['capability'], $tpl['features'], $tpl['iptables'], $tpl['custom'], $this->id);
}
......@@ -230,6 +231,8 @@ class vm_openvz_plugin {
$tpl->setVar('features', $vm['features']);
$tpl->setVar('iptables', $vm['iptables']);
$tpl->setVar('custom', $vm['custom']);
$tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ?", $app->functions->intval($vm['ostemplate_id']));
$tpl->setVar('ostemplate', $tmp['template_file']);
unset($tmp);
......
interface/web/vm/form/openvz_template.tform.php
View file @ ca069831
......@@ -475,6 +475,22 @@ $form["tabs"]['advanced'] = array (
'width' => '30',
'maxlength' => '255'
),
'custom' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXTAREA',
'default' => '',
'value' => '',
'separator' => '',
'width' => '',
'maxlength' => '',
'rows' => '10',
'cols' => '30',
'validators' => array ( 0 => array ('type' => 'CUSTOM',
'class' => 'validate_openvz',
'function' => 'check_custom',
'errmsg'=> 'custom_error'),
),
),
//#################################
// ENDE Datatable fields
//#################################
......
interface/web/vm/form/openvz_vm.tform.php
View file @ ca069831
......@@ -322,6 +322,23 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
'width' => '30',
'maxlength' => '255'
),
'custom' => array (
'datatype' => 'TEXT',
'formtype' => 'TEXTAREA',
'default' => '',
'value' => '',
'separator' => '',
'width' => '',
'maxlength' => '',
'rows' => '10',
'cols' => '30',
'searchable' => 2,
'validators' => array ( 0 => array ('type' => 'CUSTOM',
'class' => 'validate_openvz',
'function' => 'check_custom',
'errmsg'=> 'custom_error'),
),
),
//#################################
// ENDE Datatable fields
//#################################
......
interface/web/vm/lib/lang/ar_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/ar_openvz_vm.lng
View file @ ca069831
......@@ -39,4 +39,5 @@ $wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
interface/web/vm/lib/lang/bg_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/bg_openvz_vm.lng
View file @ ca069831
......@@ -39,4 +39,5 @@ $wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
interface/web/vm/lib/lang/br_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/br_openvz_vm.lng
View file @ ca069831
......@@ -39,4 +39,5 @@ $wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
interface/web/vm/lib/lang/cz_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb['Template'] = 'Šablona';
$wb['Advanced'] = 'Pokročilý';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/cz_openvz_vm.lng
View file @ ca069831
......@@ -39,5 +39,6 @@ $wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Pokročilý';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
interface/web/vm/lib/lang/de_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb['Template'] = 'Template';
$wb['Advanced'] = 'Erweitert';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/de_openvz_vm.lng
View file @ ca069831
......@@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
$wb['Virtual server'] = 'Virtueller Server';
$wb['Advanced'] = 'Erweitert';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
interface/web/vm/lib/lang/el_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/el_openvz_vm.lng
View file @ ca069831
......@@ -39,4 +39,5 @@ $wb['Virtual server'] = 'Εικονικός server';
$wb['Advanced'] = 'Για προχωρημένους';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
interface/web/vm/lib/lang/en_openvz_template.lng
View file @ ca069831
......@@ -92,4 +92,6 @@ $wb["Template"] = 'Template';
$wb["Advanced"] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["custom_error"] = "Not allowed in Custom settings: ";
?>
interface/web/vm/lib/lang/en_openvz_vm.lng
View file @ ca069831
......@@ -39,4 +39,5 @@ $wb["Virtual server"] = 'Virtual server';
$wb["Advanced"] = 'Advanced';
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment