diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 521e418f6c6be9f635b5954f291ae79cf97e9699..c9949c27937969805bb16bd4eced67c57e7b6843 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -78,6 +78,7 @@ website_path=/var/www/clients/client[client_id]/web[website_id] website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ website_symlinks_rel=n network_filesystem=n +vhost_rewrite_v6=n vhost_conf_dir=/etc/apache2/sites-available vhost_conf_enabled_dir=/etc/apache2/sites-enabled apache_init_script= diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 76573c0e964009e5acdb468ed9cabb68f63e49e8..dcbd8a9b9f05af3fdfdb205b39de4e587717bc74 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1831,10 +1831,9 @@ class apache2_plugin { //* Add vhost for IPv6 IP if($data['new']['ipv6_address'] != '') { //* rewrite ipv6 on mirrors - /* chang $conf to $web_config */ - if ($web_config['serverconfig']['web']['vhost_rewrite_v6'] == 'y') { - if (isset($web_config['serverconfig']['server']['v6_prefix']) && $web_config['serverconfig']['server']['v6_prefix'] <> '') { - $explode_v6prefix=explode(':', $web_config['serverconfig']['server']['v6_prefix']); + if (isset($conf['serverconfig']['web']['vhost_rewrite_v6']) && $conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') { + if (isset($conf['serverconfig']['server']['v6_prefix']) && $conf['serverconfig']['server']['v6_prefix'] <> '') { + $explode_v6prefix=explode(':', $conf['serverconfig']['server']['v6_prefix']); $explode_v6=explode(':', $data['new']['ipv6_address']); for ( $i = 0; $i <= count($explode_v6prefix)-1; $i++ ) {