1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-qmail-1.10.0/root/etc/e-smith/templates/var/qmail/control/virtualdomains/80localdomains mezzanine_patched_e-smith-qmail-1.10.0/root/etc/e-smith/templates/var/qmail/control/virtualdomains/80localdomains |
2 |
--- e-smith-qmail-1.10.0/root/etc/e-smith/templates/var/qmail/control/virtualdomains/80localdomains 2006-01-11 18:04:56.000000000 +1100 |
3 |
+++ mezzanine_patched_e-smith-qmail-1.10.0/root/etc/e-smith/templates/var/qmail/control/virtualdomains/80localdomains 2006-05-10 17:15:01.570371012 +1000 |
4 |
@@ -8,9 +8,7 @@ |
5 |
|
6 |
my $local_handler = "alias-localdelivery"; |
7 |
|
8 |
- use esmith::HostsDB; |
9 |
use esmith::DomainsDB; |
10 |
- my $hostsdb = esmith::HostsDB->open; |
11 |
my $domainsdb = esmith::DomainsDB->open; |
12 |
|
13 |
# Handle each defined virtual domain |
14 |
@@ -19,46 +17,4 @@ |
15 |
$domain = $domain->key; |
16 |
$OUT .= "$domain:$local_handler\n"; |
17 |
} |
18 |
- |
19 |
- # Handle each defined host |
20 |
- foreach my $host ($hostsdb->get_all) |
21 |
- { |
22 |
- # Ignore this host if its external IP address is not the same |
23 |
- # as the local machine. |
24 |
- |
25 |
- my $hosttype = $host->prop('HostType'); |
26 |
- next unless (defined $hosttype); |
27 |
- |
28 |
- my $ip = $host->prop('ExternalIP') || ""; |
29 |
- next unless ( |
30 |
- $hosttype eq 'Self' |
31 |
- || |
32 |
- ($ExternalIP && $ip eq $ExternalIP) |
33 |
- ); |
34 |
- |
35 |
- $host = $host->key; |
36 |
- if ($host =~ /\./) |
37 |
- { |
38 |
- # Host is fully qualified |
39 |
- |
40 |
- $OUT .= "$host:$local_handler\n"; |
41 |
- } |
42 |
- else |
43 |
- { |
44 |
- # Host is unqualified |
45 |
- |
46 |
- # Handle the host within the local domain and sub domain |
47 |
- |
48 |
- $OUT .= "${host}.${DomainName}:$local_handler\n"; |
49 |
- |
50 |
- # Handle the host for all of the virtual domains |
51 |
- |
52 |
- foreach my $domain ($domainsdb->get_all_by_prop(type => "domain")) |
53 |
- { |
54 |
- $domain = $domain->key; |
55 |
- $OUT .= "${host}.${domain}:$local_handler\n"; |
56 |
- } |
57 |
- } |
58 |
- } |
59 |
- chomp($OUT); |
60 |
} |