Merge branch 'master' into 'master'

added 'features' (like nfs:on) to openvz

See merge request !179

install/sql/incremental/upd_dev_collection.sql

@@ -140,4 +140,7 @@ UPDATE `dbispconfig`.`sys_ini` SET `default_logo` = 'data:image/png;base64,iVBOR
 ALTER TABLE `directive_snippets` ADD `required_php_snippets` VARCHAR(255) NOT NULL DEFAULT '' AFTER `customer_viewable`;
 ALTER TABLE `dns_rr` CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';
 ALTER TABLE `dns_soa` CHANGE `minimum` `minimum` INT(11) UNSIGNED NOT NULL DEFAULT '3600', CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';
-ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm';
\ No newline at end of file
+ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm';
+
+ALTER TABLE openvz_template ADD COLUMN `features` varchar(255) DEFAULT NULL AFTER `capability`;
+ALTER TABLE openvz_vm ADD COLUMN `features` TEXT DEFAULT NULL AFTER `capability`;

install/sql/ispconfig3.sql

@@ -1087,6 +1087,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
   `nameserver` varchar(255) DEFAULT NULL,
   `create_dns` varchar(1) NOT NULL DEFAULT 'n',
   `capability` varchar(255) DEFAULT NULL,
+  `features` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`template_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;
 
@@ -1094,7 +1095,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`) 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`) 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', '', '');
 
 -- --------------------------------------------------------
 
@@ -1150,6 +1151,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
   `nameserver` varchar(255) NOT NULL DEFAULT '8.8.8.8 8.8.4.4',
   `create_dns` varchar(1) NOT NULL DEFAULT 'n',
   `capability` text,
+  `features` text,
   `config` mediumtext,
   PRIMARY KEY (`vm_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ;

interface/lib/plugins/vm_openvz_plugin.inc.php

@@ -132,9 +132,10 @@ class vm_openvz_plugin {
 		$sql .= "io_priority = ?, ";
 		$sql .= "nameserver = ?, ";
 		$sql .= "create_dns = ?, ";
-		$sql .= "capability = ? ";
+		$sql .= "capability = ?, ";
+		$sql .= "features = ? ";
 		$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'], $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'], $this->id);
 
 	}
 
@@ -193,6 +194,7 @@ class vm_openvz_plugin {
 		$tpl->setVar('ip_address', $vm['ip_address']);
 		$tpl->setVar('nameserver', $vm['nameserver']);
 		$tpl->setVar('capability', $vm['capability']);
+		$tpl->setVar('features', $vm['features']);
 
 		$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']);

interface/web/vm/form/openvz_template.tform.php

@@ -459,6 +459,14 @@ $form["tabs"]['advanced'] = array (
 			'width'  => '30',
 			'maxlength' => '255'
 		),
+		'features' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '',
+			'value'  => '',
+			'width'  => '30',
+			'maxlength' => '255'
+		),
 		//#################################
 		// ENDE Datatable fields
 		//#################################

interface/web/vm/form/openvz_vm.tform.php

@@ -306,6 +306,14 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
 				'width'  => '30',
 				'maxlength' => '255'
 			),
+			'features' => array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'TEXT',
+				'default' => '',
+				'value'  => '',
+				'width'  => '30',
+				'maxlength' => '255'
+			),
 			//#################################
 			// ENDE Datatable fields
 			//#################################

interface/web/vm/lib/lang/ar_openvz_template.lng

@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
 $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/ar_openvz_vm.lng

@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
 $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/bg_openvz_template.lng

@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
 $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/bg_openvz_vm.lng

@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
 $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/br_openvz_template.lng

@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
 $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/br_openvz_vm.lng

@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
 $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/cz_openvz_template.lng

@@ -90,5 +90,6 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
 $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Šablona';
 $wb['Advanced'] = 'Pokročilý';
+$wb['features_txt'] = 'Features';
 ?>
 

interface/web/vm/lib/lang/cz_openvz_vm.lng

@@ -37,5 +37,6 @@ $wb['io_priority_error_empty'] = 'I/O priority is empty.';
 $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Pokročilý';
+$wb['features_txt'] = 'Features';
 ?>
 

interface/web/vm/lib/lang/de_openvz_template.lng

@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent ist leer.';
 $wb['swappages_error_empty'] = 'Swappages ist leer.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Erweitert';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/el_openvz_template.lng

@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent is empty.';
 $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/el_openvz_vm.lng

@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'Το Προτεραιότητα Ε/Ε είνα
 $wb['template_nameserver_error_empty'] = 'Το Nameserver(s) είναι κενό.';
 $wb['Virtual server'] = 'Εικονικός server';
 $wb['Advanced'] = 'Για προχωρημένους';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/en_openvz_template.lng

@@ -90,4 +90,5 @@ $wb["numiptent_error_empty"] = 'Numiptent is empty.';
 $wb["swappages_error_empty"] = 'Swappages is empty.';
 $wb["Template"] = 'Template';
 $wb["Advanced"] = 'Advanced';
-?>
\ No newline at end of file
+$wb['features_txt'] = 'Features';
+?>

interface/web/vm/lib/lang/en_openvz_vm.lng

@@ -37,4 +37,5 @@ $wb["io_priority_error_empty"] = 'I/O priority is empty.';
 $wb["template_nameserver_error_empty"] = 'Nameserver(s) is empty.';
 $wb["Virtual server"] = 'Virtual server';
 $wb["Advanced"] = 'Advanced';
-?>
\ No newline at end of file
+$wb['features_txt'] = 'Features';
+?>

interface/web/vm/lib/lang/es_openvz_template.lng

@@ -90,4 +90,5 @@ $wb['numiptent_error_empty'] = 'Numiptent esta vacío.';
 $wb['swappages_error_empty'] = 'Swappages esta vacío.';
 $wb['Template'] = 'Plantilla';
 $wb['Advanced'] = 'Avanzado';
+$wb['features_txt'] = 'Features';
 ?>

interface/web/vm/lib/lang/es_openvz_vm.lng

@@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O priority está vacío.';
 $wb['template_nameserver_error_empty'] = 'Nameserver(s) está vacío.';
 $wb['Virtual server'] = 'Servidor virtual';
 $wb['Advanced'] = 'Avanzado';
+$wb['features_txt'] = 'Features';
 ?>