| 1 |
charliebrady |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from |
| 2 |
|
|
--- smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from 2006-08-24 06:48:48.000000000 -0400 |
| 3 |
|
|
+++ mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/allow-from 2006-08-24 06:48:29.000000000 -0400 |
| 4 |
|
|
@@ -1,6 +1,12 @@ |
| 5 |
|
|
{ |
| 6 |
|
|
my $ndb = esmith::NetworksDB->open_ro; |
| 7 |
|
|
my @locals = $ndb->local_access_spec(); |
| 8 |
|
|
- $OUT = "allow_from="; |
| 9 |
|
|
- $OUT .= join(',', @locals); |
| 10 |
|
|
+ $OUT = "allow-from="; |
| 11 |
|
|
+ $OUT .= join(',', |
| 12 |
|
|
+ map { |
| 13 |
|
|
+ my ($n, $m) = split('/'); |
| 14 |
|
|
+ $m ||= '255.255.255.255'; |
| 15 |
|
|
+ ($m eq '255.255.255.255') ? $n : |
| 16 |
|
|
+ esmith::util::computeLocalNetworkShortSpec($n, $m); |
| 17 |
|
|
+ } @locals); |
| 18 |
|
|
} |
| 19 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones |
| 20 |
|
|
--- smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones 2006-08-24 06:48:48.000000000 -0400 |
| 21 |
|
|
+++ mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/etc/e-smith/templates/var/service/pdns_recursor/recursor.conf/forward-zones 2006-08-24 06:29:30.000000000 -0400 |
| 22 |
|
|
@@ -3,14 +3,20 @@ |
| 23 |
|
|
my $ddb = esmith::DomainsDB->open_ro; |
| 24 |
|
|
use esmith::NetworksDB; |
| 25 |
|
|
my $ndb = esmith::NetworksDB->open_ro; |
| 26 |
|
|
- my $tinydns_ip = $tinydns{'ListenIP'} || "127.0.0.1"; |
| 27 |
|
|
+ my $tinydns_ip = $tinydns{'ListenIP'} || "127.0.0.1"; |
| 28 |
|
|
|
| 29 |
|
|
my @delegations = map { |
| 30 |
|
|
- $_->key . "=" . ($_->prop('Nameserver') || $tinydns_ip) |
| 31 |
|
|
+ $_->key . "=" . ($_->prop('Nameserver') || $tinydns_ip) |
| 32 |
|
|
} $ddb->domains; |
| 33 |
|
|
my @reverse_delegations = map { |
| 34 |
|
|
- $_->key . "=" . ($_->prop('Nameservers') || $tinydns_ip) |
| 35 |
|
|
- } $ndb->domains; |
| 36 |
|
|
+ my $key = $_->key; |
| 37 |
|
|
+ my $mask = $_->prop('Mask'); |
| 38 |
|
|
+ my $nameserver = $_->prop('Nameservers') || $tinydns_ip; |
| 39 |
|
|
+ my $reverse = esmith::util::computeLocalNetworkReversed ($key, $mask); |
| 40 |
|
|
+ # Remove the trailing period provided by computeLocalNetworkReversed |
| 41 |
|
|
+ $reverse =~ s/\.$//; |
| 42 |
|
|
+ "$reverse=$nameserver" |
| 43 |
|
|
+ } $ndb->networks; |
| 44 |
|
|
|
| 45 |
|
|
$OUT = "forward-zones=" . |
| 46 |
|
|
join(',', @delegations, @reverse_delegations); |
| 47 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run |
| 48 |
|
|
--- smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run 2006-08-24 06:48:48.000000000 -0400 |
| 49 |
|
|
+++ mezzanine_patched_smeserver-pdns_recursor-0.0.1/root/var/service/pdns_recursor/run 2006-08-24 02:53:52.000000000 -0400 |
| 50 |
|
|
@@ -1,3 +1,3 @@ |
| 51 |
|
|
#! /bin/sh |
| 52 |
|
|
|
| 53 |
|
|
-exec pdns_recursor --daemon=no |
| 54 |
|
|
+exec pdns_recursor --daemon=no --config-dir=$(pwd) |
Parent Directory
| 
Revision Log
| 
Revision Graph
