1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/03ServerAlias mezzanine_patched_e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/03ServerAlias |
2 |
--- e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/03ServerAlias 2006-03-14 09:47:18.000000000 -0700 |
3 |
+++ mezzanine_patched_e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/03ServerAlias 2007-02-23 09:03:41.000000000 -0700 |
4 |
@@ -1,8 +1,13 @@ |
5 |
ServerAlias { |
6 |
|
7 |
use esmith::HostsDB; |
8 |
+ use esmith::DomainsDB; |
9 |
my $hdb = esmith::HostsDB->open_ro(); |
10 |
- my @hosts = grep { $_->prop('HostType') eq 'Self' } $hdb->get_hosts_by_domain($virtualHost); |
11 |
+ my %domains = map { $_->key => 1 } esmith::DomainsDB->open_ro->domains; |
12 |
+ my @hosts = grep { |
13 |
+ my $h = $_; |
14 |
+ ($h->prop('HostType') eq 'Self') && !$domains{$h->key} |
15 |
+ } $hdb->get_hosts_by_domain($virtualHost); |
16 |
$OUT = join " ", map { $_->key } @hosts; |
17 |
} |
18 |
|