The main IP of the server isn't inserted twice improvement of the multiserv...

vogelor

2008-12-18 fbae749d3d0f90ddaa427c361208692b14c1d78a

The main IP of the server isn't inserted twice
improvement of the multiserver-environment (ip of the server is always the same)

 server/plugins-available/network_settings_plugin.inc.php

@@ -94,13 +94,18 @@
            $network_tpl->setVar('broadcast',$this->broadcast($server_config["ip_address"],$server_config["netmask"]));
            $network_tpl->setVar('network',$this->network($server_config["ip_address"],$server_config["netmask"]));
            
            $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf["server_id"]));
            $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf["server_id"]) . " order by ip_address");

            $ip_records = array();
            $additionl_ip_records = 0;
            $n = 0;
            if(is_array($records)) {
                foreach($records as $rec) {
                    $ip_records[] = array(
                    /*

                     * don't insert the main-ip again!

                     */

                    if ($rec['ip_address'] != $server_config["ip_address"])

                    {

                        $ip_records[$n] = array(

                        'id' => $n,
                        'ip_address' => $rec['ip_address'],
                        'netmask' => $server_config["netmask"],
@@ -112,15 +117,42 @@
                    $n++;
                }
            }
            }

			
            /*

             * If we have more than 1 IP we have to add the main-ip at the end

             * of the network-ip-list. If we don't do so, there may be problems

             * in multi-server-settings (with the acces from other server to the

             * main-server) because the LAST IP in the list is the IP mysql uses

             * to determine the host, the user is logging in from.

             */

            if ($additionl_ip_records != 0)

            {

                $swap["ip_address"] = $ip_records[$n-1]["ip_address"];

                $swap["netmask"] = $ip_records[$n-1]["netmask"];

                $swap["gateway"] = $ip_records[$n-1]["gateway"];

				
                $ip_records[$n-1] = array(

                    'id' => $n-1,

                    'ip_address' => $server_config['ip_address'],

                    'netmask' => $server_config["netmask"],

                    'gateway' => $server_config["gateway"],

                    'broadcast' => $this->broadcast($server_config['ip_address'],$server_config["netmask"]),

                    'network' => $this->network($server_config['ip_address'],$server_config["netmask"])

                );

                $network_tpl->setVar('ip_address',$swap["ip_address"]);

                $network_tpl->setVar('netmask',$swap["netmask"]);

                $network_tpl->setVar('gateway',$swap["gateway"]);

                $network_tpl->setVar('broadcast',$this->broadcast($swap["ip_address"],$swap["netmask"]));

                $network_tpl->setVar('network',$this->network($swap["ip_address"],$swap["netmask"]));

            }

            
            $network_tpl->setVar('additionl_ip_records',$additionl_ip_records);
            $network_tpl->setLoop('interfaces',$ip_records);

            file_put_contents('/etc/network/interfaces',$network_tpl->grab());
            unset($network_tpl);
            
            $app->log("Changed Network settings",LOGLEVEL_DEBUG);
			
            exec('/etc/init.d/networking force-reload');
        } else {
            if(is_file('/etc/debian_version')) {