[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/dns] powerdns/bin: Generate zone file directly. Else errors end up in zone files instead o
From:       Tom Albers <toma () kde ! org>
Date:       2013-03-04 19:14:05
Message-ID: 20130304191405.8AE3AA604F () git ! kde ! org
[Download RAW message or body]

Git commit 38436dbeccdba3a7681a68da45a7d61a81041812 by Tom Albers.
Committed on 04/03/2013 at 20:12.
Pushed by toma into branch 'master'.

Generate zone file directly. Else errors end up in zone files instead of the zone \
file.

M  +12   -14   powerdns/bin/generate-zone-file.php
M  +1    -1    powerdns/bin/update-all.sh

http://commits.kde.org/sysadmin/dns/38436dbeccdba3a7681a68da45a7d61a81041812

diff --git a/powerdns/bin/generate-zone-file.php \
b/powerdns/bin/generate-zone-file.php index 8e25a6a..cbe0ca8 100644
--- a/powerdns/bin/generate-zone-file.php
+++ b/powerdns/bin/generate-zone-file.php
@@ -1,6 +1,6 @@
 <?php
 
-$handle = @fopen("../bind/local-kde.org.zone","r");
+$handle = @fopen("/etc/powerdns/bind/master/local-kde.org.zone","r");
 if ($handle) {
     while (($buffer = fgets($handle, 4096)) !== false) {
 	if (substr($buffer,0,15) == ";; git.anonscm:") { 
@@ -53,6 +53,7 @@ foreach ($continents as $continent) {
 $types = array("A", "AAAA");
 
 // loop over for each record.
+$fp = @fopen("/etc/powerdns/generated/local-kde.org.zone","w");
 foreach ($active as $key=>$a) {
 	unset($config);
 
@@ -79,25 +80,22 @@ foreach ($active as $key=>$a) {
 
 	// Output
 	foreach($config as $c_continent=>$c_servers) {
-		echo "; ".$nw_continents[$c_continent]."\n";
+		fwrite($fp, "; ".$nw_continents[$c_continent]."\n");
 		foreach ($c_servers as $c_server) {
 			foreach ($types as $type) {
 				if (array_key_exists($type,$servers[$c_server])) {
-					echo $c_continent.".".$key." ";
-					echo "IN ";
-					echo $type." ";
-					echo $servers[$c_server][$type];
-					echo " ; ".$c_server;
-					echo "\n";
+					fwrite($fp, $c_continent.".".$key." ");
+					fwrite($fp, "IN ");
+					fwrite($fp, $type." ");
+					fwrite($fp, $servers[$c_server][$type]);
+					fwrite($fp, " ; ".$c_server);
+					fwrite($fp, "\n");
 				}	
 			}
 		}	
-		echo $c_continent.".".$key." ";
-		echo "IN ";
-		echo "TXT ";
-		echo "\"pool: ".implode($c_servers,", ")."\"";
-		echo "\n";
-		echo "\n";
+		fwrite($fp, $c_continent.".".$key." IN TXT ");
+		fwrite($fp, "\"pool: ".implode($c_servers,", ")."\"\n\n");
 	}
 }
+fclose($fp);
 ?>
diff --git a/powerdns/bin/update-all.sh b/powerdns/bin/update-all.sh
index b5f1492..7bb6628 100644
--- a/powerdns/bin/update-all.sh
+++ b/powerdns/bin/update-all.sh
@@ -6,4 +6,4 @@ cd /etc/powerdns/bin && /usr/bin/php \
generate-iso-to-contentint-table.php git.an  cd /etc/powerdns/bin && /usr/bin/php \
generate-iso-to-contentint-table.php svn.anonscm.local-kde.org anonscm.local-kde.org \
> /etc/powerdns/generated/svn.anonscm.local-kde.org   
 # Generate the zone file with the servers per continent.
-cd /etc/powerdns/bin && /usr/bin/php generate-zone-file.php > \
/etc/powerdns/generated/local-kde.org.zone +cd /etc/powerdns/bin && /usr/bin/php \
generate-zone-file.php


[prev in list] [next in list] [prev in thread] [next in thread]