From 3b0c841739fded5c2a3a8d769535ae869c241977 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 13 Nov 2022 21:09:15 +0100 Subject: [PATCH 1/4] Fix var name issue crippling vhost_rewrite_v6? closes #6414 --- server/plugins-available/apache2_plugin.inc.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 76573c0e96..d92816cdd5 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 ($conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') { + if (isset($conf['serverconfig']['server']['v6_prefix']) && $conif['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++ ) { -- GitLab From c807efcc1fd1adca10262f218688ec2a25fec40d Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 14 Nov 2022 08:46:51 +0100 Subject: [PATCH 2/4] typo --- server/plugins-available/apache2_plugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index d92816cdd5..373ce91163 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1832,7 +1832,7 @@ class apache2_plugin { if($data['new']['ipv6_address'] != '') { //* rewrite ipv6 on mirrors if ($conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') { - if (isset($conf['serverconfig']['server']['v6_prefix']) && $conif['serverconfig']['server']['v6_prefix'] <> '') { + 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']); -- GitLab From 63e349618641c23fb48cfb6eb9604422d9d8a2d8 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 14 Nov 2022 08:53:03 +0100 Subject: [PATCH 3/4] Add a default value for vhost_rewrite_v6 in server.ini --- install/tpl/server.ini.master | 1 + 1 file changed, 1 insertion(+) diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 521e418f6c..c9949c2793 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= -- GitLab From 42614a924647ce7d23854a754944e1b2d22b52a9 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 14 Nov 2022 08:55:39 +0100 Subject: [PATCH 4/4] Extra isset test --- server/plugins-available/apache2_plugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 373ce91163..dcbd8a9b9f 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1831,7 +1831,7 @@ class apache2_plugin { //* Add vhost for IPv6 IP if($data['new']['ipv6_address'] != '') { //* rewrite ipv6 on mirrors - if ($conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') { + 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']); -- GitLab