From 54afe0e3036f339e623e98f5d3fbb397376c7ca2 Mon Sep 17 00:00:00 2001 From: Florian Schaal <florian@schaal-24.de> Date: Sun, 15 Feb 2015 10:05:48 +0100 Subject: [PATCH] allow ipv6 for openvz-container --- install/sql/incremental/upd_dev_collection.sql | 2 ++ interface/web/vm/form/openvz_ip.tform.php | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index ec07f35138..a05084ee4a 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -38,3 +38,5 @@ ALTER TABLE `web_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAU ALTER TABLE `sys_datalog` ADD INDEX `dbtable` (`dbtable` (25), `dbidx` (25)), ADD INDEX (`action`); ALTER TABLE `mail_user` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `postfix`; ALTER TABLE `mail_forwarding` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `active`; + +ALTER TABLE `openvz_ip` CHANGE `ip_address` `ip_address` VARCHAR(39) DEFAULT NULL; diff --git a/interface/web/vm/form/openvz_ip.tform.php b/interface/web/vm/form/openvz_ip.tform.php index 181d6415d9..e43b28de20 100644 --- a/interface/web/vm/form/openvz_ip.tform.php +++ b/interface/web/vm/form/openvz_ip.tform.php @@ -77,10 +77,9 @@ $form["tabs"]['main'] = array ( 'ip_address' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'validators' => array ( 0 => array ( 'type' => 'ISIPV4', - 'errmsg'=> 'ip_error_wrong'), - 1 => array ( 'type' => 'UNIQUE', - 'errmsg'=> 'ip_error_unique'), + 'validators' => array ( + 0 => array ( 'type' => 'ISIP', 'errmsg'=> 'ip_error_wrong'), + 1 => array ( 'type' => 'UNIQUE', 'errmsg'=> 'ip_error_unique'), ), 'default' => '', 'value' => '', -- GitLab