From e63545f72d9b7d8177dc67f80a4295a12b4fb5a5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 07 Jun 2012 09:03:09 -0400
Subject: [PATCH] Improved: FS#2131 - skip network reconfigure requests on mirror servers that are for a different server_id
---
server/plugins-available/network_settings_plugin.inc.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php
index 2bea300..b711139 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -239,7 +239,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