Changeset 739

Timestamp:

May 23, 2015, 12:07:08 AM (9 years ago)

Author:

chronos

Message:

• Added: NetworkDomainServer table to configure DNS servers for domains.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/DNS.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 738; // Subversion revision
-$DatabaseRevision = 736; // SQL structure revision
-$ReleaseTime = strtotime('2015-04-14');
+$Revision = 739; // Subversion revision
+$DatabaseRevision = 739; // SQL structure revision
+$ReleaseTime = strtotime('2015-05-22');

trunk/Common/Setup/Updates.php

@@ -1343 +1343 @@
   $Manager->Execute('ALTER TABLE `NetworkLinkType`
 MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+}
+
+function UpdateTo739($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkDomain` ADD KEY (`Parent`);');
+  $Manager->Execute('ALTER TABLE `NetworkDomain` ADD FOREIGN KEY (`Parent`) REFERENCES `NetworkDomain`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkDomainServer` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Address` varchar(255) NOT NULL,
+  `Domain` int(11) NOT NULL,
+  `Sequence` int(11) NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+
+  $Manager->Execute('ALTER TABLE `NetworkDomainServer`
+ ADD PRIMARY KEY (`Id`), ADD KEY `Domain` (`Domain`);');
+
+  $Manager->Execute('ALTER TABLE `NetworkDomainServer`
+ADD CONSTRAINT `NetworkDomainServer_ibfk_1` FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain` (`Id`);');
+
 }
 
@@ -1411 +1431 @@
       731 => array('Revision' => 735, 'Function' => 'UpdateTo735'),
       735 => array('Revision' => 736, 'Function' => 'UpdateTo736'),
+      736 => array('Revision' => 739, 'Function' => 'UpdateTo739'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -294 +294 @@
         'Refresh' => array('Type' => 'Integer', 'Caption' => 'Obnovení', 'Default' => '28800'),
         'TTL' => array('Type' => 'Integer', 'Caption' => 'TTL', 'Default' => '86400', 'Suffix' => 'sekund'),
+        'Servers' => array('Type' => 'TNetworkDomainServerList', 'Caption' => 'Servery', 'Default' => ''),
       ),
     ));
@@ -301 +302 @@
       'Id' => 'Id',
       'Name' => 'Name',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterClass('NetworkDomainServer', array(
+      'Title' => 'Doménový server',
+      'Table' => 'NetworkDomainServer',
+      'DefaultSortColumn' => 'Address',
+      'DefaultSortOrder' => 1,
+      'Items' => array(
+        'Address' => array('Type' => 'String', 'Caption' => 'Adresa', 'Default' => ''),
+        'Domain' => array('Type' => 'TNetworkDomain', 'Caption' => 'Doména', 'Default' => ''),
+        'Sequence' => array('Type' => 'Integer', 'Caption' => 'Pořadí', 'Default' => '1'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TNetworkDomainServerList', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'NetworkDomainServer',
+      'Id' => 'Id',
+      'Ref' => 'Domain',
       'Filter' => '1',
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -13 +13 @@
 $Routerboard->Debug = true;
 
-// Devices, Interfaces
-$Items = array();
-$DbResult = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
-  'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-  'WHERE `NetworkDevice`.`Used`=1');
-while($Interface = $DbResult->fetch_assoc())
+$DbResult = $System->Database->query('SELECT * FROM `NetworkDomain`');
+while($Domain = $DbResult->fetch_assoc())
 {
-  $Name = $Interface['DeviceName'];
-  if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-  $Name .= '.zdechov.net';
-  $Items[] = array('name' => $Name, 'address' => $Interface['LocalIP'], 'ttl' => '1d');
+  $DomainName = $Domain['Name'];
+
+  // Get full domain name from parent items
+  $CurrentDomain = $Domain;
+  while($CurrentDomain['Parent'] > 0)
+  {
+    $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomain` WHERE `Id`='.$CurrentDomain['Parent']);
+    $CurrentDomain = $DbResult2->fetch_assoc();
+    $DomainName .= '.'.$CurrentDomain['Name'];
+  }
+
+  // Devices, Interfaces
+  $Items = array();
+  $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
+    'JOIN `NetworkDevice` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
+    'WHERE `NetworkDevice`.`Used`=1');
+  while($Interface = $DbResult2->fetch_assoc())
+  {
+    $Name = $Interface['DeviceName'];
+    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    $Name .= '.'.$DomainName;
+    $Items[] = array('name' => $Name, 'address' => $Interface['LocalIP'], 'ttl' => '1d');
+  }
+
+  // Domain aliases
+  $DbResult2 = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP` FROM `NetworkDomainAlias` '.
+    'JOIN `NetworkDevice` ON `NetworkDomainAlias`.`Target`=`NetworkDevice`.`Name` '.
+    'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
+    'WHERE `NetworkDevice`.`Used`=1');
+  while($Alias = $DbResult2->fetch_assoc())
+  {
+    $Name = $Alias['Name'];
+    $Name .= '.'.$DomainName;
+    $Items[] = array('name' => $Name, 'address' => $Alias['LocalIP'], 'ttl' => $Domain['TTL']);
+  }
+
+  $DbResult2 = $System->Database->query('SELECT * FROM `NetworkDomainServer` WHERE `Domain`='.$Domain['Id']);
+  if($DbResult2->num_rows > 0)
+  {
+    $Server = $DbResult2->fetch_assoc();
+    $Routerboard->HostName = $Server['Address'];
+    $Routerboard->ListUpdate($Path, array('name', 'address', 'ttl'), $Items);
+  }
 }
-
-// Domain aliases
-$DbResult = $System->Database->query('SELECT `NetworkDomainAlias`.*, `NetworkInterface`.`LocalIP` AS `LocalIP` FROM `NetworkDomainAlias` '.
-  'JOIN `NetworkDevice` ON `NetworkDomainAlias`.`Target`=`NetworkDevice`.`Name` '.
-  'JOIN `NetworkInterface` ON `NetworkInterface`.`Device`=`NetworkDevice`.`Id` '.
-  'WHERE `NetworkDevice`.`Used`=1');
-while($Alias = $DbResult->fetch_assoc())
-{
-  $Name = $Alias['Name'];
-  $Name .= '.zdechov.net';
-  $Items[] = array('name' => $Name, 'address' => $Alias['LocalIP'], 'ttl' => '1d');
-}
-
-$Routerboard->HostName = '192.168.10.1';
-$Routerboard->ListUpdate($Path, array('name', 'address', 'ttl'), $Items);