Commit 95377233 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '6414-php-warning' into 'develop'

Fix var name issue crippling vhost_rewrite_v6?

Closes #6414

See merge request !1663
parents 9d987984 42614a92
Pipeline #12728 passed with stage
in 9 seconds
......@@ -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=
......
......@@ -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++ ) {
......
Supports Markdown
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