diff options
Diffstat (limited to 'modules-available/dnbd3/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/dnbd3/baseconfig/getconfig.inc.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules-available/dnbd3/baseconfig/getconfig.inc.php b/modules-available/dnbd3/baseconfig/getconfig.inc.php index d614dc6f..fe1bef17 100644 --- a/modules-available/dnbd3/baseconfig/getconfig.inc.php +++ b/modules-available/dnbd3/baseconfig/getconfig.inc.php @@ -2,6 +2,12 @@ if (!Dnbd3::isEnabled()) return; +if (!Dnbd3::hasNfsFallback()) { + ConfigHolder::add("SLX_VM_NFS", false, 1000); + ConfigHolder::add("SLX_VM_NFS_USER", false, 1000); + ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000); +} + // Locations from closest to furthest (order) $locations = ConfigHolder::get('SLX_LOCATIONS'); if ($locations === false) { @@ -18,6 +24,7 @@ $res = Database::simpleQuery('SELECT s.fixedip, m.clientip, sxl.locationid FROM LEFT JOIN dnbd3_server_x_location sxl USING (serverid) WHERE sxl.locationid IS NULL OR sxl.locationid IN (:lids)', array('lids' => $locationIds)); // Lookup of priority - first index (0) will be closest location in chain +// low value is higher priority $locationsAssoc = array_flip($locationIds); $servers = array(); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { @@ -27,7 +34,7 @@ while ($row = $res->fetch(PDO::FETCH_ASSOC)) { } else { $defPrio = 1000; } - $ip = $row['clientip'] ? $row['clientip'] : $row['fixedip']; + $ip = $row['fixedip'] ? $row['fixedip'] : $row['clientip']; if ($defPrio === 1000 && is_null($row['locationid'])) { $serverLoc = Location::getFromIp($ip); if ($serverLoc !== false) { |