Changeset 313 for trunk/system

Timestamp:

Apr 11, 2011, 4:21:38 PM (14 years ago)

Author:

george

Message:

• Upraveno: Při generování DNS záznamů poslední dvojčíslí serial upraveno na poměrovou část dnes (setinu).

Location:

trunk/system/generators

Files:

• dns.php (modified) (7 diffs)
• netwatch_import.php (modified) (1 diff)

trunk/system/generators/dns.php

@@ -5 +5 @@
 
 $BaseDomain = 'zdechov.net';
-$Serial = date('Ymds', time());
+$Now = getdate();
+$I = floor(($Now['hours'] * 60 * 60 + $Now['minutes'] * 60 + $Now['seconds']) / (24 * 60 * 60) * 100); 
+$Serial = date('Ymd', time()).$I;
 $MinimumTime = 7200;
 $RetryTime = 7200;
@@ -94 +96 @@
     $File = fopen($DNS['BaseDir'].$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa.zone', 'w+');
     fputs($File, $Output);
+    //echo($Output);
     fclose($File);
   }
@@ -157 +160 @@
 $ExternalDNS = array(
   'Domain' => $BaseDomain,
+  'Serial' => $Serial,
+  'Refresh' => $RefreshTime,
+  'Expire' => $ExpireTime,
+  'Retry' => $RetryTime,
+  'Minimum' => $MinimumTime,
+  'TTL' => $TTL,
+  'Description' => 'ZdechovNET community network',
+  'BaseDir' => '/var/named/external/',
+  'MailServer' => array('centrala.'.$BaseDomain),
+  'NameServer' => array('gw-hajda.inext.cz', 'ns0.xname.org', 'ns1.twisted4life.com'),
+  'ReverseNameServer' => array('gw-hajda.inext.cz', 'inext.inext.cz'),
+  'Host' => array(),
+  'Alias' => array(),
+  'Network' => array('81.2.194', '193.86.238', '212.111.4', '77.92.221'),
+);
+
+$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP != ""');
+while($Interface = $DbResult->fetch_assoc())
+{
+  $Name = $Interface['DeviceName'];
+  if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+  $ExternalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['ExternalIP']);
+}
+
+// Domain alias
+$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`'); 
+// JOIN `NetworkDevice` ON NetworkDomainAlias.Target LIKE NetworkDevice.Name AND NetworkInterface.ExternalIP != ""');
+while($Alias = $DbResult->fetch_assoc())
+{
+  $ExternalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
+}
+
+/*
+// === CZFree network DNS server ===
+$BaseDomain = 'zdechov.zlin.czf';
+$CZFreeDNS = array(
+  'Domain' => $BaseDomain,
   'Serial' => date('Ymds', time()),
   'Refresh' => 28800,
@@ -164 +204 @@
   'TTL' => 86400,
   'Description' => 'ZdechovNET community network',
-  'BaseDir' => '/var/named/external/',
-  'MailServer' => array('centrala.'.$BaseDomain),
-  'NameServer' => array('gw-hajda.inext.cz', 'ns0.xname.org', 'ns1.twisted4life.com'),
-  'ReverseNameServer' => array('gw-hajda.inext.cz', 'inext.inext.cz'),
-  'Host' => array(),
-  'Alias' => array(),
-  'Network' => array('81.2.194', '193.86.238', '212.111.4', '77.92.221'),
-);
-
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP != ""');
-while($Interface = $DbResult->fetch_assoc())
-{
-  $Name = $Interface['DeviceName'];
-  if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-  $ExternalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['ExternalIP']);
+  'BaseDir' => '/var/named/czfree/',
+  'MailServer' => array('centrala.'.$BaseDomain),
+  'NameServer' => array('centrala.'.$BaseDomain, 'tv.'.$BaseDomain),
+  'ReverseNameServer' => array('centrala.'.$BaseDomain, 'tv.'.$BaseDomain),
+  'Host' => array(),
+  'Alias' => array(),
+  'Network' => array('10.144.200'),
+);
+
+// Hosts
+$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP != ""');
+while($Interface = $DbResult->fetch_assoc())
+{
+  $Name = $Interface['DeviceName'];
+  if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+  $CZFreeDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['CZFreeIP']);
 }
 
 // Domain alias
-$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`'); 
-// JOIN `NetworkDevice` ON NetworkDomainAlias.Target LIKE NetworkDevice.Name AND NetworkInterface.ExternalIP != ""');
-while($Alias = $DbResult->fetch_assoc())
-{
-  $ExternalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
-}
-
-/*
-// === CZFree network DNS server ===
-$BaseDomain = 'zdechov.zlin.czf';
-$CZFreeDNS = array(
+$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
+// JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
+while($Alias = $DbResult->fetch_assoc())
+{
+  $CZFreeDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
+}
+
+// === CZFree network local address ===
+$BaseDomain = 'zdechovnet.czf';
+$CZFreeLocalDNS = array(
   'Domain' => $BaseDomain,
   'Serial' => date('Ymds', time()),
@@ -201 +241 @@
   'TTL' => 86400,
   'Description' => 'ZdechovNET community network',
-  'BaseDir' => '/var/named/czfree/',
+  'BaseDir' => '/var/named/internal/',
   'MailServer' => array('centrala.'.$BaseDomain),
   'NameServer' => array('centrala.'.$BaseDomain, 'tv.'.$BaseDomain),
@@ -216 +256 @@
   $Name = $Interface['DeviceName'];
   if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-  $CZFreeDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['CZFreeIP']);
+  $CZFreeLocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['CZFreeIP']);
+  $CZFreeLocalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP']);
 }
 
@@ -224 +265 @@
 while($Alias = $DbResult->fetch_assoc())
 {
-  $CZFreeDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
-}
-
-// === CZFree network local address ===
-$BaseDomain = 'zdechovnet.czf';
-$CZFreeLocalDNS = array(
-  'Domain' => $BaseDomain,
-  'Serial' => date('Ymds', time()),
-  'Refresh' => 28800,
-  'Expire' => 2419200,
-  'Retry' => 7200,
-  'Minimum' => 10800,
-  'TTL' => 86400,
-  'Description' => 'ZdechovNET community network',
-  'BaseDir' => '/var/named/internal/',
-  'MailServer' => array('centrala.'.$BaseDomain),
-  'NameServer' => array('centrala.'.$BaseDomain, 'tv.'.$BaseDomain),
-  'ReverseNameServer' => array('centrala.'.$BaseDomain, 'tv.'.$BaseDomain),
-  'Host' => array(),
-  'Alias' => array(),
-  'Network' => array('10.144.200'),
-);
-
-// Hosts
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP != ""');
-while($Interface = $DbResult->fetch_assoc())
-{
-  $Name = $Interface['DeviceName'];
-  if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
-  $CZFreeLocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['CZFreeIP']);
-  $CZFreeLocalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP']);
-}
-
-// Domain alias
-$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
-// JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
-while($Alias = $DbResult->fetch_assoc())
-{
   $CZFreeLocalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
 }

trunk/system/generators/netwatch_import.php

@@ -7 +7 @@
 $Path = array('tool', 'netwatch');
 
-$DbResult3 = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');
+$DbResult3 = $Database->query('SELECT * FROM `NetworkSubnet`  WHERE `Member` = 0');
 while($Subnet = $DbResult3->fetch_assoc())
 {