1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80OptDomain mezzanine_patched_smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80OptDomain |
2 |
|
|
--- smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80OptDomain 1969-12-31 17:00:00.000000000 -0700 |
3 |
|
|
+++ mezzanine_patched_smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80OptDomain 2007-06-28 08:50:21.000000000 -0600 |
4 |
|
|
@@ -0,0 +1,25 @@ |
5 |
|
|
+{ |
6 |
|
|
+ my $status = $roundcube{'status'} || "disabled"; |
7 |
|
|
+ return " # roundcube-status is disabled." |
8 |
|
|
+ unless $status eq 'enabled'; |
9 |
|
|
+ |
10 |
|
|
+ my $domain = $roundcube{'domain'} || "disabled"; |
11 |
|
|
+ return " # no hostname or domain for roundcube defined" |
12 |
|
|
+ if $domain eq 'disabled'; |
13 |
|
|
+ |
14 |
|
|
+ my $DocRoot = "/opt/roundcube"; |
15 |
|
|
+ |
16 |
|
|
+ $OUT = ""; |
17 |
|
|
+ $OUT .= "\n"; |
18 |
|
|
+ $OUT .= "# Redirect an existing hostname or domain to $DocRoot.\n"; |
19 |
|
|
+ $OUT .= "<VirtualHost 0.0.0.0:80>\n"; |
20 |
|
|
+ $OUT .= " ServerName $roundcube{'domain'}\n"; |
21 |
|
|
+ $OUT .= " DocumentRoot $DocRoot\n"; |
22 |
|
|
+ $OUT .= "</VirtualHost>\n"; |
23 |
|
|
+ $OUT .= "<VirtualHost 0.0.0.0:443>\n"; |
24 |
|
|
+ $OUT .= " ServerName $roundcube{'domain'}\n"; |
25 |
|
|
+ $OUT .= " DocumentRoot $DocRoot\n"; |
26 |
|
|
+ $OUT .= " SSLEngine on\n"; |
27 |
|
|
+ $OUT .= "</VirtualHost>\n"; |
28 |
|
|
+} |
29 |
|
|
+ |
30 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundCubeAliases mezzanine_patched_smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundCubeAliases |
31 |
|
|
--- smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundCubeAliases 2007-06-21 01:37:08.000000000 -0600 |
32 |
|
|
+++ mezzanine_patched_smeserver-roundcube-0.9/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundCubeAliases 2007-06-28 08:44:43.000000000 -0600 |
33 |
|
|
@@ -5,7 +5,7 @@ |
34 |
|
|
|
35 |
|
|
if ($port eq "443") |
36 |
|
|
{ |
37 |
|
|
- $OUT .= " ProxyPass /roundcube http://127.0.0.1/roundcube\n"; |
38 |
|
|
+ $OUT .= " ProxyPass /roundcube/ http://127.0.0.1/roundcube/\n"; |
39 |
|
|
} |
40 |
|
|
} |
41 |
|
|
|