From c92c979c6f1aef5143cd5794b246375351668df0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 28 Aug 2012 06:37:43 +0000
Subject: [PATCH] Implemented: FS#2000 - Remove 192.168.x defaults from network
configuration settings.
---
install/tpl/server.ini.master | 6 +++---
server/plugins-available/network_settings_plugin.inc.php | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index e745a32de9..f9deca3773 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -6,11 +6,11 @@ dnsserver=mydns
[server]
auto_network_configuration=n
-ip_address=192.168.0.105
+ip_address=0.0.0.0
netmask=255.255.255.0
-gateway=192.168.0.1
+gateway=0.0.0.0
hostname=server1.domain.tld
-nameservers=192.168.0.1,192.168.0.2
+nameservers=8.8.8.8,8.8.4.4
firewall=bastille
loglevel=2
backup_dir=/var/backup
diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php
index b711139dd1..8355d9e6d3 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -81,7 +81,10 @@ class network_settings_plugin {
//* 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'))
{
--
GitLab