From a3609a0f7fbd97ae487341e88c0b81fc5bf5b81d Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 07 May 2015 04:48:16 -0400
Subject: [PATCH] FS#2096 - Add "iptables" line in openvz vhost template file
---
interface/web/vm/lib/lang/fr_openvz_template.lng | 1
interface/web/vm/lib/lang/se_openvz_template.lng | 1
interface/web/vm/lib/lang/ar_openvz_template.lng | 1
interface/web/vm/lib/lang/ja_openvz_template.lng | 1
interface/web/vm/lib/lang/ro_openvz_template.lng | 1
interface/web/vm/lib/lang/pl_openvz_template.lng | 1
interface/web/vm/lib/lang/hu_openvz_vm.lng | 1
interface/web/vm/lib/lang/sk_openvz_template.lng | 1
install/sql/ispconfig3.sql | 4 +
install/sql/incremental/upd_dev_collection.sql | 2 +
interface/web/vm/lib/lang/hu_openvz_template.lng | 1
interface/web/vm/lib/lang/pt_openvz_vm.lng | 1
interface/web/vm/lib/lang/el_openvz_vm.lng | 1
interface/web/vm/lib/lang/sk_openvz_vm.lng | 1
interface/web/vm/lib/lang/de_openvz_template.lng | 1
interface/web/vm/lib/lang/tr_openvz_vm.lng | 1
interface/web/vm/lib/lang/cz_openvz_template.lng | 1
interface/web/vm/lib/lang/de_openvz_vm.lng | 1
interface/web/vm/lib/lang/it_openvz_template.lng | 1
interface/web/vm/lib/lang/hr_openvz_vm.lng | 1
interface/web/vm/lib/lang/br_openvz_template.lng | 1
interface/web/vm/lib/lang/id_openvz_vm.lng | 1
interface/web/vm/lib/lang/nl_openvz_template.lng | 1
interface/web/vm/lib/lang/fi_openvz_template.lng | 1
interface/web/vm/lib/lang/pl_openvz_vm.lng | 1
interface/web/vm/form/openvz_vm.tform.php | 8 ++++
interface/web/vm/lib/lang/br_openvz_vm.lng | 1
interface/web/vm/lib/lang/es_openvz_template.lng | 1
interface/web/vm/lib/lang/ru_openvz_template.lng | 1
interface/web/vm/lib/lang/se_openvz_vm.lng | 1
interface/web/vm/lib/lang/ar_openvz_vm.lng | 1
interface/web/vm/lib/lang/id_openvz_template.lng | 1
interface/web/vm/lib/lang/tr_openvz_template.lng | 1
interface/web/vm/templates/openvz_vm_advanced_edit.htm | 4 ++
interface/web/vm/lib/lang/en_openvz_template.lng | 2 +
interface/web/vm/lib/lang/fr_openvz_vm.lng | 1
interface/web/vm/lib/lang/ja_openvz_vm.lng | 1
interface/web/vm/form/openvz_template.tform.php | 8 ++++
interface/web/vm/lib/lang/nl_openvz_vm.lng | 1
interface/web/vm/lib/lang/ro_openvz_vm.lng | 1
interface/lib/plugins/vm_openvz_plugin.inc.php | 6 ++-
interface/web/vm/lib/lang/es_openvz_vm.lng | 1
interface/web/vm/lib/lang/pt_openvz_template.lng | 1
interface/web/vm/lib/lang/ru_openvz_vm.lng | 1
interface/web/vm/lib/lang/bg_openvz_template.lng | 1
interface/web/vm/lib/lang/en_openvz_vm.lng | 1
interface/web/vm/lib/lang/fi_openvz_vm.lng | 1
interface/web/vm/lib/lang/bg_openvz_vm.lng | 1
interface/web/vm/lib/lang/hr_openvz_template.lng | 1
interface/web/vm/lib/lang/it_openvz_vm.lng | 1
interface/web/vm/lib/lang/el_openvz_template.lng | 1
interface/web/vm/templates/openvz.conf.tpl | 1
interface/web/vm/lib/lang/cz_openvz_vm.lng | 1
interface/web/vm/templates/openvz_template_advanced_edit.htm | 5 ++
54 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index cab8942..1f8b21d 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -145,3 +145,5 @@
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 effd84f..9d90b5e 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1089,6 +1089,7 @@
`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 @@
-- 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_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 7cf46e6..73cc9cd 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -133,9 +133,10 @@
$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 @@
$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 b2dcc80..fd67c99 100644
--- a/interface/web/vm/form/openvz_template.tform.php
+++ b/interface/web/vm/form/openvz_template.tform.php
@@ -467,6 +467,14 @@
'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 4c04846..666d06c 100644
--- a/interface/web/vm/form/openvz_vm.tform.php
+++ b/interface/web/vm/form/openvz_vm.tform.php
@@ -314,6 +314,14 @@
'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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c7c3025..86a2f69 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['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 148c362..9655370 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['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 add0b41..ee491de 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['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 c773885..e7245ec 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['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 5aa53cd..a6ac96a 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['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 875ae3c..bc3056a 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['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 3e8c97d..ba29ed3 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["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 1aa6e8b..a5b5792 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["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 6955e84..2d3b28e 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['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 2224462..facd954 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 5fe1152..ab9453e 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['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 1b6ab56..1f07414 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['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 eb20160..9ade43f 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['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 31b3ab3..36b3ee6 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 c6c489f..84757a5 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['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 37066b4..93bf907 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['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 49ead3c..1cb4dc0 100644
--- a/interface/web/vm/templates/openvz.conf.tpl
+++ b/interface/web/vm/templates/openvz.conf.tpl
@@ -49,3 +49,4 @@
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 b8f3421..4ef22d6 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 @@
<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>
+ <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>
+ <div class="form-group">
+ <label for="iptables" class="col-sm-3 control-label">{tmpl_var name='iptables_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="iptables" id="iptables" value="{tmpl_var name='iptables'}" class="form-control" /></div></div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/vm/templates/openvz_vm_advanced_edit.htm b/interface/web/vm/templates/openvz_vm_advanced_edit.htm
index f2bc68a..83bbb3d 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 @@
<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>
+ <div class="form-group">
+ <label for="iptables" class="col-sm-3 control-label">{tmpl_var name='iptables_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="iptables" id="iptables" value="{tmpl_var name='iptables'}" class="form-control" />
+ </div></div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
--
Gitblit v1.9.1