diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index cab89427e1d15bfe4a123b34f8da4484df0cd917..1f8b21d26d3c0ebf080d25e012f4018caf16bd31 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -145,3 +145,5 @@ ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR(255) NOT 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`; +ALTER TABLE openvz_template ADD COLUMN `iptables` varchar(255) DEFAULT NULL AFTER `features`; +ALTER TABLE openvz_vm ADD COLUMN `iptables` TEXT DEFAULT NULL AFTER `features`; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index effd84f06e7e229071e3bab49ff5cf76c77b33d9..9d90b5e9ef5efa31a8e7ceb9655d03bf0d9159bf 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1089,6 +1089,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` ( `create_dns` varchar(1) NOT NULL DEFAULT 'n', `capability` varchar(255) DEFAULT NULL, `features` varchar(255) DEFAULT NULL, + `iptables` varchar(255) DEFAULT NULL, PRIMARY KEY (`template_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1096,7 +1097,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`) 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', '', '', ''); -- -------------------------------------------------------- @@ -1153,6 +1154,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` ( `create_dns` varchar(1) NOT NULL DEFAULT 'n', `capability` text, `features` text, + `iptabless` text, `config` mediumtext, PRIMARY KEY (`vm_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php index 7cf46e63c04d20fd97b56f1465b656f14eab00e6..73cc9cda86fd3e2be17a351ccda7fff974e4cf08 100644 --- a/interface/lib/plugins/vm_openvz_plugin.inc.php +++ b/interface/lib/plugins/vm_openvz_plugin.inc.php @@ -133,9 +133,10 @@ class vm_openvz_plugin { $sql .= "nameserver = ?, "; $sql .= "create_dns = ?, "; $sql .= "capability = ?, "; - $sql .= "features = ? "; + $sql .= "features = ?, "; + $sql .= "iptables = ? "; $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'], $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'], $this->id); } @@ -195,6 +196,7 @@ class vm_openvz_plugin { $tpl->setVar('nameserver', $vm['nameserver']); $tpl->setVar('capability', $vm['capability']); $tpl->setVar('features', $vm['features']); + $tpl->setVar('iptables', $vm['iptables']); $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']); diff --git a/interface/web/vm/form/openvz_template.tform.php b/interface/web/vm/form/openvz_template.tform.php index b2dcc80db80e226ee9e8337dd7f744d792526c83..fd67c99179837855f5e65ca16bcf9c32cdcb9dae 100644 --- a/interface/web/vm/form/openvz_template.tform.php +++ b/interface/web/vm/form/openvz_template.tform.php @@ -467,6 +467,14 @@ $form["tabs"]['advanced'] = array ( 'width' => '30', 'maxlength' => '255' ), + 'iptables' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), //################################# // ENDE Datatable fields //################################# diff --git a/interface/web/vm/form/openvz_vm.tform.php b/interface/web/vm/form/openvz_vm.tform.php index 4c04846b9046a0201417c65f933d67114ac2757d..666d06cf353c37a4bdff4f340fa7c00f1ac8470f 100644 --- a/interface/web/vm/form/openvz_vm.tform.php +++ b/interface/web/vm/form/openvz_vm.tform.php @@ -314,6 +314,14 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { 'width' => '30', 'maxlength' => '255' ), + 'iptables' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), //################################# // ENDE Datatable fields //################################# diff --git a/interface/web/vm/lib/lang/ar_openvz_template.lng b/interface/web/vm/lib/lang/ar_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/ar_openvz_template.lng +++ b/interface/web/vm/lib/lang/ar_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ar_openvz_vm.lng b/interface/web/vm/lib/lang/ar_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/ar_openvz_vm.lng +++ b/interface/web/vm/lib/lang/ar_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/bg_openvz_template.lng b/interface/web/vm/lib/lang/bg_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/bg_openvz_template.lng +++ b/interface/web/vm/lib/lang/bg_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/bg_openvz_vm.lng b/interface/web/vm/lib/lang/bg_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/bg_openvz_vm.lng +++ b/interface/web/vm/lib/lang/bg_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/br_openvz_template.lng b/interface/web/vm/lib/lang/br_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/br_openvz_template.lng +++ b/interface/web/vm/lib/lang/br_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/br_openvz_vm.lng b/interface/web/vm/lib/lang/br_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/br_openvz_vm.lng +++ b/interface/web/vm/lib/lang/br_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng index c7c30252f6b61557a1796dd32c313f079f8324f8..86a2f6967768a5511981bab0085feebe2362e08f 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template.lng @@ -91,5 +91,6 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Šablona'; $wb['Advanced'] = 'Pokročilý'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng index 148c362276dca02b3e3a962d04d6e1180898a20d..9655370cec1a7a1c2a39abc9bb7821449f6435b9 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng @@ -38,5 +38,6 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Pokročilý'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/de_openvz_template.lng b/interface/web/vm/lib/lang/de_openvz_template.lng index add0b419237df2199954d114f169bffccb4c790e..ee491de598b3948699b16899ea7aabd8ea51b29d 100644 --- a/interface/web/vm/lib/lang/de_openvz_template.lng +++ b/interface/web/vm/lib/lang/de_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages ist leer.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Erweitert'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/de_openvz_vm.lng b/interface/web/vm/lib/lang/de_openvz_vm.lng index c773885c69426bfc0bd1c044c15a86e10f5ed7fd..e7245ec0eaa6bb914ff2197b5e7a8f883567a4fb 100644 --- a/interface/web/vm/lib/lang/de_openvz_vm.lng +++ b/interface/web/vm/lib/lang/de_openvz_vm.lng @@ -37,4 +37,5 @@ $wb['io_priority_error_empty'] = 'I/O Priorität ist leer.'; $wb['template_nameserver_error_empty'] = 'Nameserver ist leer.'; $wb['Virtual server'] = 'Virtueller Server'; $wb['Advanced'] = 'Erweitert'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng index 5aa53cdd4be8824b172407c5b15646743cd972a9..a6ac96a0f083e1aa2f3e3dff3cc1e50be43453f7 100644 --- a/interface/web/vm/lib/lang/el_openvz_template.lng +++ b/interface/web/vm/lib/lang/el_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng index 875ae3cf5db8becd14d6b5886a6f282386f97920..bc3056a445808d72d55119e4dc2364f4e7a85963 100644 --- a/interface/web/vm/lib/lang/el_openvz_vm.lng +++ b/interface/web/vm/lib/lang/el_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Το Nameserver(s) είναι κενό $wb['Virtual server'] = 'Εικονικός server'; $wb['Advanced'] = 'Για προχωρημένους'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/en_openvz_template.lng b/interface/web/vm/lib/lang/en_openvz_template.lng index 3e8c97dcd5f05565b015c3bf7fc32f606cdd3684..ba29ed3fa0f2eb61b60485dfeec8d112a38889ac 100644 --- a/interface/web/vm/lib/lang/en_openvz_template.lng +++ b/interface/web/vm/lib/lang/en_openvz_template.lng @@ -91,4 +91,6 @@ $wb["swappages_error_empty"] = 'Swappages is empty.'; $wb["Template"] = 'Template'; $wb["Advanced"] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb['features_txt'] = 'iptables'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/en_openvz_vm.lng b/interface/web/vm/lib/lang/en_openvz_vm.lng index 1aa6e8b84911316227ab0c1e3401ab9d62fc5bf3..a5b57929b14294e8da4e0efe0c97ce00dee0e16c 100644 --- a/interface/web/vm/lib/lang/en_openvz_vm.lng +++ b/interface/web/vm/lib/lang/en_openvz_vm.lng @@ -38,4 +38,5 @@ $wb["template_nameserver_error_empty"] = 'Nameserver(s) is empty.'; $wb["Virtual server"] = 'Virtual server'; $wb["Advanced"] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/es_openvz_template.lng b/interface/web/vm/lib/lang/es_openvz_template.lng index 6955e84e2e0e378818ed7413b3732250c0c4e51a..2d3b28eae32ea95e99148b3b7699d6f8cd28ded9 100644 --- a/interface/web/vm/lib/lang/es_openvz_template.lng +++ b/interface/web/vm/lib/lang/es_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages esta vacío.'; $wb['Template'] = 'Plantilla'; $wb['Advanced'] = 'Avanzado'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/es_openvz_vm.lng b/interface/web/vm/lib/lang/es_openvz_vm.lng index 22244628a60d63a5658b3163a6f62c9240fcf776..facd954aa5eb5451d57efece65aa9671acf82db5 100644 --- a/interface/web/vm/lib/lang/es_openvz_vm.lng +++ b/interface/web/vm/lib/lang/es_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) está vacío.'; $wb['Virtual server'] = 'Servidor virtual'; $wb['Advanced'] = 'Avanzado'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/fi_openvz_template.lng b/interface/web/vm/lib/lang/fi_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/fi_openvz_template.lng +++ b/interface/web/vm/lib/lang/fi_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/fi_openvz_vm.lng b/interface/web/vm/lib/lang/fi_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/fi_openvz_vm.lng +++ b/interface/web/vm/lib/lang/fi_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/fr_openvz_template.lng b/interface/web/vm/lib/lang/fr_openvz_template.lng index 5fe1152e96b1a09f74098ed3b9e8f8cf47cefb60..ab9453e4ebb5d8748f11ce5acc5d772763da82ef 100644 --- a/interface/web/vm/lib/lang/fr_openvz_template.lng +++ b/interface/web/vm/lib/lang/fr_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages est vide.'; $wb['Template'] = 'Modèle'; $wb['Advanced'] = 'Avancé'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/fr_openvz_vm.lng b/interface/web/vm/lib/lang/fr_openvz_vm.lng index 1b6ab566dff7312306c3499fd68ffeca292630c7..1f07414e571f9e633219861f6c99cf373eeb77c3 100644 --- a/interface/web/vm/lib/lang/fr_openvz_vm.lng +++ b/interface/web/vm/lib/lang/fr_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.'; $wb['Virtual server'] = 'Serveur virtuel'; $wb['Advanced'] = 'Avancé'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/hr_openvz_template.lng b/interface/web/vm/lib/lang/hr_openvz_template.lng index eb2016086649a7bd9fb65968d82d5aea5e256ade..9ade43f0b1ffb239a314cf88f3738fc2d8fc8644 100644 --- a/interface/web/vm/lib/lang/hr_openvz_template.lng +++ b/interface/web/vm/lib/lang/hr_openvz_template.lng @@ -91,6 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages polje je prazno.'; $wb['Template'] = 'Predložak'; $wb['Advanced'] = 'Napredno'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/hr_openvz_vm.lng b/interface/web/vm/lib/lang/hr_openvz_vm.lng index 31b3ab3fe82cd74fbb542b60a515f2752dc88b17..36b3ee6cffd9b6061301f8e6fbfd1fe2967ede8a 100644 --- a/interface/web/vm/lib/lang/hr_openvz_vm.lng +++ b/interface/web/vm/lib/lang/hr_openvz_vm.lng @@ -38,6 +38,7 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(i) polje je prazno.'; $wb['Virtual server'] = 'Virtualni server'; $wb['Advanced'] = 'Napredno'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/hu_openvz_template.lng b/interface/web/vm/lib/lang/hu_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/hu_openvz_template.lng +++ b/interface/web/vm/lib/lang/hu_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/hu_openvz_vm.lng b/interface/web/vm/lib/lang/hu_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/hu_openvz_vm.lng +++ b/interface/web/vm/lib/lang/hu_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/id_openvz_template.lng b/interface/web/vm/lib/lang/id_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/id_openvz_template.lng +++ b/interface/web/vm/lib/lang/id_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/id_openvz_vm.lng b/interface/web/vm/lib/lang/id_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/id_openvz_vm.lng +++ b/interface/web/vm/lib/lang/id_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/it_openvz_template.lng b/interface/web/vm/lib/lang/it_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/it_openvz_template.lng +++ b/interface/web/vm/lib/lang/it_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/it_openvz_vm.lng b/interface/web/vm/lib/lang/it_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/it_openvz_vm.lng +++ b/interface/web/vm/lib/lang/it_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ja_openvz_template.lng b/interface/web/vm/lib/lang/ja_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/ja_openvz_template.lng +++ b/interface/web/vm/lib/lang/ja_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ja_openvz_vm.lng b/interface/web/vm/lib/lang/ja_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/ja_openvz_vm.lng +++ b/interface/web/vm/lib/lang/ja_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/nl_openvz_template.lng b/interface/web/vm/lib/lang/nl_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/nl_openvz_template.lng +++ b/interface/web/vm/lib/lang/nl_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/nl_openvz_vm.lng b/interface/web/vm/lib/lang/nl_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/nl_openvz_vm.lng +++ b/interface/web/vm/lib/lang/nl_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/pl_openvz_template.lng +++ b/interface/web/vm/lib/lang/pl_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/pl_openvz_vm.lng +++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/pt_openvz_template.lng b/interface/web/vm/lib/lang/pt_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/pt_openvz_template.lng +++ b/interface/web/vm/lib/lang/pt_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/pt_openvz_vm.lng b/interface/web/vm/lib/lang/pt_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/pt_openvz_vm.lng +++ b/interface/web/vm/lib/lang/pt_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ro_openvz_template.lng b/interface/web/vm/lib/lang/ro_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/ro_openvz_template.lng +++ b/interface/web/vm/lib/lang/ro_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ro_openvz_vm.lng b/interface/web/vm/lib/lang/ro_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/ro_openvz_vm.lng +++ b/interface/web/vm/lib/lang/ro_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ru_openvz_template.lng b/interface/web/vm/lib/lang/ru_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/ru_openvz_template.lng +++ b/interface/web/vm/lib/lang/ru_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/ru_openvz_vm.lng b/interface/web/vm/lib/lang/ru_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/ru_openvz_vm.lng +++ b/interface/web/vm/lib/lang/ru_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/se_openvz_template.lng b/interface/web/vm/lib/lang/se_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/se_openvz_template.lng +++ b/interface/web/vm/lib/lang/se_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/se_openvz_vm.lng b/interface/web/vm/lib/lang/se_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/se_openvz_vm.lng +++ b/interface/web/vm/lib/lang/se_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/sk_openvz_template.lng b/interface/web/vm/lib/lang/sk_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/sk_openvz_template.lng +++ b/interface/web/vm/lib/lang/sk_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/sk_openvz_vm.lng b/interface/web/vm/lib/lang/sk_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/sk_openvz_vm.lng +++ b/interface/web/vm/lib/lang/sk_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/tr_openvz_template.lng b/interface/web/vm/lib/lang/tr_openvz_template.lng index c6c489f74fe47e031a1e4c28b29e87e551ceceb7..84757a5e708150d087b9357b255eda49cb4fa667 100644 --- a/interface/web/vm/lib/lang/tr_openvz_template.lng +++ b/interface/web/vm/lib/lang/tr_openvz_template.lng @@ -91,4 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/lib/lang/tr_openvz_vm.lng b/interface/web/vm/lib/lang/tr_openvz_vm.lng index 37066b413562a1aff2a6c88f4809a0f67df3bbdd..93bf90724db0e63f0196d3ee1dbc61673c032ec5 100644 --- a/interface/web/vm/lib/lang/tr_openvz_vm.lng +++ b/interface/web/vm/lib/lang/tr_openvz_vm.lng @@ -38,4 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; $wb['features_txt'] = 'Features'; +$wb[iptables_txt] = iptables; ?> diff --git a/interface/web/vm/templates/openvz.conf.tpl b/interface/web/vm/templates/openvz.conf.tpl index 49ead3c491bc5dcd31767d2d260b1c8c750dec43..1cb4dc06198ec0ea84cf8d72dd87578a6b547764 100644 --- a/interface/web/vm/templates/openvz.conf.tpl +++ b/interface/web/vm/templates/openvz.conf.tpl @@ -49,3 +49,4 @@ MEMINFO="privvmpages:1" CAPABILITY="{tmpl_var name='capability'}" FEATURES="{tmpl_var name='features'}" +IPTABLES="{tmpl_var name='iptables'}" diff --git a/interface/web/vm/templates/openvz_template_advanced_edit.htm b/interface/web/vm/templates/openvz_template_advanced_edit.htm index b8f3421d478819530715c6acb0d7541b4253310c..4ef22d6b079c3d2b156906b5e6fc03fbb36abbf7 100644 --- a/interface/web/vm/templates/openvz_template_advanced_edit.htm +++ b/interface/web/vm/templates/openvz_template_advanced_edit.htm @@ -75,8 +75,11 @@
- +
+
+ +
diff --git a/interface/web/vm/templates/openvz_vm_advanced_edit.htm b/interface/web/vm/templates/openvz_vm_advanced_edit.htm index f2bc68afd23e56e69b25b21ff5fe427741498692..83bbb3d5198de864ba4755140936ef5fc5d4a3e4 100644 --- a/interface/web/vm/templates/openvz_vm_advanced_edit.htm +++ b/interface/web/vm/templates/openvz_vm_advanced_edit.htm @@ -54,6 +54,10 @@
+
+ +
+