Commit a3609a0f authored by Florian Schaal's avatar Florian Schaal

FS#2096 - Add "iptables" line in openvz vhost template file

parent 671f79d3
......@@ -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`;
......@@ -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 ;
......
......@@ -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']);
......
......@@ -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
//#################################
......
......@@ -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
//#################################
......
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -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;
?>
......@@ -49,3 +49,4 @@ MEMINFO="privvmpages:1"
CAPABILITY="{tmpl_var name='capability'}"
FEATURES="{tmpl_var name='features'}"
IPTABLES="{tmpl_var name='iptables'}"
......@@ -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'}">
......
......@@ -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'}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment