From 4ccdf7b9c1783e2b80000af92ba73c1bcf7cac01 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 12 Feb 2013 09:01:43 -0500
Subject: [PATCH] - Fixed FS#2666 - Deletion of SSH users generates warning in cron log. - Fixed "usermod: user web25 is currently used by process 8106" error when a site is moved between clients.
---
server/plugins-available/network_settings_plugin.inc.php | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php
index f9c01da..8355d9e 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -79,8 +79,12 @@
$app->uses('getconf');
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
- // Configure the debian network card settings
- if($server_config['auto_network_configuration'] == 'y') {
+ //* Configure the debian network card settings.
+ //* Dont configure
+ 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'))
{
@@ -238,7 +242,12 @@
}
} else {
- $app->log('Network configuration disabled in server settings.',LOGLEVEL_WARN);
+ 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