1 |
mrjhb3 |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header |
2 |
|
|
--- e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2010-04-27 21:48:17.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2010-04-27 21:42:08.000000000 -0500 |
4 |
|
|
@@ -1,4 +1,4 @@ |
5 |
|
|
//00header |
6 |
|
|
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ |
7 |
|
|
-// $Horde: horde/config/conf.xml,v 1.74.2.88 2009/09/02 08:21:46 jan Exp $ |
8 |
|
|
+// $Horde: horde/config/conf.xml,v 1.74.2.89 2010/04/21 08:02:24 jan Exp $ |
9 |
|
|
|
10 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock mezzanine_patched_e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock |
11 |
|
|
--- e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock 2010-05-01 08:07:07.000000000 -0500 |
12 |
|
|
+++ mezzanine_patched_e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/330PortalBlock 2010-05-01 08:06:29.000000000 -0500 |
13 |
|
|
@@ -1,7 +1,7 @@ |
14 |
|
|
//330PortalBlock |
15 |
|
|
$conf['portal']['fixed_blocks'] = array(); |
16 |
|
|
-$conf['weatherdotcom']['license_key'] = '{ $horde{weatherdotcompartnerid} }'; |
17 |
|
|
-$conf['weatherdotcom']['partner_id'] = '{ $horde{weatherdotcomlicensekey} }'; |
18 |
|
|
+$conf['weatherdotcom']['license_key'] = '{ $horde{weatherdotcomlicensekey} }'; |
19 |
|
|
+$conf['weatherdotcom']['partner_id'] = '{ $horde{weatherdotcompartnerid} }'; |
20 |
|
|
$conf['accounts']['params']['quota_path'] = '/usr/bin/quota'; |
21 |
|
|
$conf['accounts']['params']['grep_path'] = '/bin/grep'; |
22 |
|
|
$conf['accounts']['params']['translateMountPoint'] = false; |