From ef55b578effea959ed4fdcdb0fd4bbab38209fef Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 06 Sep 2012 11:21:32 -0400
Subject: [PATCH] - New feature: you can now add directive snippets for Apache, nginx, and PHP under System > Directive Snippets. These snippets are then available on the Options tab of a web site where they can be easily added to the respective textarea by simply clicking the name of the directive snippet.
---
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