From 6b1d788d1d50fd38f68f152285f3fa816a9d7880 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 27 Dec 2013 12:16:20 -0500
Subject: [PATCH] Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
---
server/plugins-available/apache2_plugin.inc.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 17d30d8..db47d58 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1435,9 +1435,11 @@
//* Add vhost for IPv6 IP
if($data['new']['ipv6_address'] != '') {
- if ($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']);
+ //* 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']);
$explode_v6=explode(':', $data['new']['ipv6_address']);
for ( $i = 0; $i <= count($explode_v6prefix)-3; $i++ ) {
--
Gitblit v1.9.1