Florian Schaal
2015-04-27 503bbb5b05c6ec24e1c5dc7afa71cee3ab8578c2
added 'features' (like nfs:on) to openvz
53 files modified
95 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 5 ●●●● patch | view | raw | blame | history
install/sql/ispconfig3.sql 4 ●●● patch | view | raw | blame | history
interface/lib/plugins/vm_openvz_plugin.inc.php 6 ●●●●● patch | view | raw | blame | history
interface/web/vm/form/openvz_template.tform.php 8 ●●●●● patch | view | raw | blame | history
interface/web/vm/form/openvz_vm.tform.php 8 ●●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ar_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ar_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/bg_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/bg_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/br_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/br_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/cz_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/cz_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/de_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/en_openvz_template.lng 3 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/en_openvz_vm.lng 3 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/es_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/es_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fi_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fi_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hr_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hr_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hu_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/hu_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/id_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/id_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/it_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/it_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ja_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ja_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/nl_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/nl_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pl_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pl_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pt_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/pt_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ro_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ro_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ru_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/ru_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/se_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/se_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/sk_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/sk_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/tr_openvz_template.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/lib/lang/tr_openvz_vm.lng 1 ●●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz.conf.tpl 1 ●●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz_template_advanced_edit.htm 5 ●●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz_vm_advanced_edit.htm 9 ●●●● patch | view | raw | blame | history
install/sql/incremental/upd_dev_collection.sql
@@ -140,4 +140,7 @@
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';
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 @@
  `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 @@
-- 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 @@
  `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 @@
        $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 @@
        $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 @@
            '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 @@
                '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['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['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['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['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['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['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['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['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['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['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['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["swappages_error_empty"] = 'Swappages is empty.';
$wb["Template"] = 'Template';
$wb["Advanced"] = 'Advanced';
?>
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/en_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/es_openvz_template.lng
@@ -90,4 +90,5 @@
$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['template_nameserver_error_empty'] = 'Nameserver(s) está vacío.';
$wb['Virtual server'] = 'Servidor virtual';
$wb['Advanced'] = 'Avanzado';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/fi_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/fi_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/fr_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages est vide.';
$wb['Template'] = 'Modèle';
$wb['Advanced'] = 'Avancé';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/fr_openvz_vm.lng
@@ -37,4 +37,5 @@
$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
$wb['Virtual server'] = 'Serveur virtuel';
$wb['Advanced'] = 'Avancé';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/hr_openvz_template.lng
@@ -90,6 +90,7 @@
$wb['swappages_error_empty'] = 'Swappages polje je prazno.';
$wb['Template'] = 'Predložak';
$wb['Advanced'] = 'Napredno';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/hr_openvz_vm.lng
@@ -37,6 +37,7 @@
$wb['template_nameserver_error_empty'] = 'Nameserver(i) polje je prazno.';
$wb['Virtual server'] = 'Virtualni server';
$wb['Advanced'] = 'Napredno';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/hu_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/hu_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/id_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/id_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/it_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/it_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/ja_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/ja_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/nl_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/nl_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/pl_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/pt_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/pt_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/ro_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/ro_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/ru_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/ru_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/se_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/se_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/sk_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/sk_openvz_vm.lng
@@ -37,4 +37,5 @@
$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/tr_openvz_template.lng
@@ -90,4 +90,5 @@
$wb['swappages_error_empty'] = 'Swappages is empty.';
$wb['Template'] = 'Template';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/lib/lang/tr_openvz_vm.lng
@@ -37,4 +37,5 @@
$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
$wb['Virtual server'] = 'Virtual server';
$wb['Advanced'] = 'Advanced';
$wb['features_txt'] = 'Features';
?>
interface/web/vm/templates/openvz.conf.tpl
@@ -48,3 +48,4 @@
# SWAPPAGES="{tmpl_var name='swappages'}"
CAPABILITY="{tmpl_var name='capability'}"
FEATURES="{tmpl_var name='features'}"
interface/web/vm/templates/openvz_template_advanced_edit.htm
@@ -74,6 +74,9 @@
            <div class="form-group">
                <label for="capability" class="col-sm-3 control-label">{tmpl_var name='capability_txt'}</label>
                <div class="col-sm-9"><input type="text" name="capability" id="capability" value="{tmpl_var name='capability'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="capability" class="col-sm-3 control-label">{tmpl_var name='features_txt'}</label>
                <div class="col-sm-9"><input type="text" name="features" id="features" value="{tmpl_var name='features'}" class="form-control" /></div></div>
        
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -81,4 +84,4 @@
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="vm/openvz_template_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_template_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
        </div></div>
interface/web/vm/templates/openvz_vm_advanced_edit.htm
@@ -48,7 +48,12 @@
            </div></div>
            <div class="form-group">
                <label for="capability" class="col-sm-3 control-label">{tmpl_var name='capability_txt'}</label>
                <div class="col-sm-9"><input type="text" name="capability" id="capability" value="{tmpl_var name='capability'}" class="form-control" /></div></div>
                <div class="col-sm-9"><input type="text" name="capability" id="capability" value="{tmpl_var name='capability'}" class="form-control" />
            </div></div>
            <div class="form-group">
                <label for="features" class="col-sm-3 control-label">{tmpl_var name='features_txt'}</label>
                <div class="col-sm-9"><input type="text" name="features" id="features" value="{tmpl_var name='features'}" class="form-control" />
            </div></div>
        
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -56,4 +61,4 @@
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="vm/openvz_vm_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
        </div></div>