Changeset 854

Timestamp:

Mar 18, 2018, 12:19:26 PM (7 years ago)

Author:

chronos

Message:

• Modified: Generate IPv6 records for DNS server.
• Modified: Add more webcams.

Location:

trunk/Modules

Files:

• NetworkConfigLinux/Generators/DNS.php (modified) (8 diffs)
• NetworkConfigRouterOS/Routerboard.php (modified) (2 diffs)
• WebCam/WebCam.php (modified) (1 diff)

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -42 +42 @@
     // Base server
     $Output .= "@\tIN\tA\t".strtolower($DNS['BaseServer'])."\n";
+    $Output .= "@\tIN\tAAAA\t".strtolower($DNS['BaseServerIPv6'])."\n";
 
     // IPv4 host list
@@ -75 +76 @@
       $Output = // '$ORIGIN '.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa'."\n".
       '$TTL '.$DNS['TTL']."\n".
-      "@\tIN\tSOA\t".$DNS['NameServer'][0].".\troot.".$DNS['Domain'].".  (\n".
+      "@\tIN\tSOA\t".$DNS['ReverseNameServer'][0].".\troot.".$DNS['Domain'].".  (\n".
       "\t\t\t\t".$DNS['Serial']."\t; serial\n".
       "\t\t\t\t".$DNS['Refresh']."\t; refresh\n".
@@ -109 +110 @@
       $Output = // '$ORIGIN '.$Parts[2].'.'.$Parts[1].'.'.$Parts[0].'.in-addr.arpa'."\n".
       '$TTL '.$DNS['TTL']."\n".
-      "@\tIN\tSOA\t".$DNS['NameServer'][0].".\troot.".$DNS['Domain'].".  (\n".
+      "@\tIN\tSOA\t".$DNS['ReverseNameServer'][0].".\troot.".$DNS['Domain'].".  (\n".
       "\t\t\t\t".$DNS['Serial']."\t; serial\n".
       "\t\t\t\t".$DNS['Refresh']."\t; refresh\n".
@@ -158 +159 @@
     $MinimumTime = 10800;
     $TTL = 86400;
-    $BaseDir = '/var/named';
+    $BaseDir = '/var/cache/bind';
     //$BaseDir = '/home/chronos/Projekty/centrala/trunk/var/named';
     if(!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
@@ -175 +176 @@
         'Description' => 'ZdechovNET community network',
         'BaseDir' => $BaseDir.'/internal/',
-        'MailServer' => array('centrala.'.$BaseDomain),
+        'MailServer' => array('mail.'.$BaseDomain),
         'NameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'BaseServer' => '10.145.64.8',
+        'BaseServerIPv6' => '2a00:e580:244:1::4',
         'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),
@@ -241 +243 @@
         'Description' => 'ZdechovNET community network',
         'BaseDir' => $BaseDir.'/external/',
-        'MailServer' => array('centrala.'.$BaseDomain),
-        'NameServer' => array('gw-hajda.inext.cz', 'ns0.xname.org', 'ns2.afraid.org'),
+        'MailServer' => array('mail.'.$BaseDomain),
+        'NameServer' => array('gw-hajda.inext.cz', 'ns2.afraid.org', 'ns5.he.net'),
         'BaseServer' => '10.145.64.8',
-        'ReverseNameServer' => array('gw-hajda.inext.cz', 'inext.inext.cz'),
+        'BaseServerIPv6' => '2a00:e580:244:1::4',
+        'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),
         'Alias' => array(),
@@ -283 +286 @@
         'Description' => 'ZdechovNET community network',
         'BaseDir' => $BaseDir.'/czfree/',
-        'MailServer' => array('centrala.'.$BaseDomain),
+        'MailServer' => array('mail.'.$BaseDomain),
         'NameServer' => array('centrala.'.$BaseDomain, 'mozek'.$BaseDomain),
         'BaseServer' => '10.145.64.8',
+        'BaseServerIPv6' => '2a00:e580:244:1::4',
         'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),
@@ -325 +329 @@
         'Description' => 'ZdechovNET community network',
         'BaseDir' => $BaseDir.'/internal/',
-        'MailServer' => array('centrala.'.$BaseDomain),
+        'MailServer' => array('mail.'.$BaseDomain),
         'NameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'BaseServer' => '10.145.64.8',
+        'BaseServerIPv6' => '2a00:e580:244:1::4',
         'ReverseNameServer' => array('centrala.'.$BaseDomain, 'mozek.'.$BaseDomain),
         'Host' => array(),

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -8 +8 @@
   var $UserName;
   var $Password;
-  var $PrivateKey = 'id_dsa';
+  var $PrivateKey = '~/.ssh/id_dsa';
   var $MaxBurstLineCount = 100;
   var $Debug = false;
@@ -52 +52 @@
       $Commands = str_replace('$', '\$', $Commands);
       //$Commands = str_replace(' ', '\ ', $Commands);
-      $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
+      $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -o HostKeyAlgorithms=+ssh-dss -o KexAlgorithms=diffie-hellman-group14-sha1 -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
       if($this->Debug) echo($Command);
       $Output = array();

trunk/Modules/WebCam/WebCam.php

@@ -67 +67 @@
     global $Config;
     $Output = '';
-    $Output .= '<a href="http://www.zdechov.net/kamery/?id=5"><img alt="Koupaliště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam5.jpg" /></a>';
-    $Output .= '<a href="http://www.zdechov.net/kamery/?id=1"><img alt="Webkamera školní hřiště" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam.jpg" /></a>';
-    $Output .= '<a href="http://www.zdechov.net/kamery/?id=2"><img alt="Webkamera střed obce obloha" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam2.jpg" /></a>';
-    $Output .= '<a href="http://www.zdechov.net/kamery/?id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam3.jpg" /></a>';
-    $Output .= '<a href="http://www.zdechov.net/kamery/?id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam4.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=5"><img alt="Koupaliště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam5.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=1"><img alt="Webkamera školní hřiště" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=2"><img alt="Webkamera střed obce obloha" width="140" height="105" src="http://www.zdechov.net/images/webcam/webcam2.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=3"><img alt="Skiareál, motokrosová grapa" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam3.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=4"><img alt="Fotbalové hřiště" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam4.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=6"><img alt="Lev výběh 1" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam6.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=7"><img alt="Lev výběh 2" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam7.jpg" /></a>';
+    $Output .= '<a href="http://www.zdechov.net/kamery/?Id=8"><img alt="Lev domek" width="140" height="79" src="http://www.zdechov.net/images/webcam/webcam8.jpg" /></a>';
     return($Output);
   }