From aa78fde6a92f66b84d626e114d8b54a5fb6ece0c Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 14 Nov 2012 07:19:43 -0500 Subject: [PATCH] - Added function for IPv6 prefixes in multiserver mirror setups to nginx plugin. --- server/plugins-available/network_settings_plugin.inc.php | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php index 2bea300..8355d9e 100644 --- a/server/plugins-available/network_settings_plugin.inc.php +++ b/server/plugins-available/network_settings_plugin.inc.php @@ -81,7 +81,10 @@ //* Configure the debian network card settings. //* Dont configure - if($server_config['auto_network_configuration'] == 'y' && $data['mirrored'] == false) { + if($server_config['auto_network_configuration'] == 'y' && + $data['mirrored'] == false && + $server_config['ip_address'] != '0.0.0.0' && + $server_config['gateway'] != '0.0.0.0') { if (is_file('/etc/debian_version')) { @@ -239,7 +242,12 @@ } } else { - $app->log('Network configuration disabled in server settings or server is a mirror server.',LOGLEVEL_DEBUG); + if($data['mirrored'] == true) { + $app->log('Skipping network config request. IP addresses from amster are not configured on the mirror.',LOGLEVEL_DEBUG); + } + if($server_config['auto_network_configuration'] == 'n') { + $app->log('Network configuration disabled in server settings.',LOGLEVEL_DEBUG); + } } } -- Gitblit v1.9.1