/[smecontribs]/rpms/smeserver-zarafa/contribs7/smeserver-zarafa-0.9.0-move-webaccess.patch
ViewVC logotype

Annotation of /rpms/smeserver-zarafa/contribs7/smeserver-zarafa-0.9.0-move-webaccess.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Thu Feb 11 13:09:45 2010 UTC (14 years, 9 months ago) by dungog
Branch: MAIN
CVS Tags: smeserver-zarafa-0_9_0-45_el4_sme 
* Thu Feb 11 2010 Stephen Noble <support@dungog.net> - 0.9-45
- webaccess location changed upstream [SME 5420]
- requires zarafa >= 6.30.6
1 dungog 1.1 diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-install
2     --- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-install 2010-02-11 20:49:41.000000000 +1100
3     +++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-install 2010-02-11 23:58:08.000000000 +1100
4     @@ -7,7 +7,10 @@
5     /sbin/e-smith/signal-event remoteaccess-update
6    
7     /bin/echo "webaccess config"
8     -/bin/chown -R www:www /var/www/html/webaccess/tmp
9     +/bin/chown -R www:www /var/lib/zarafa-webaccess/tmp
10     +FILE=/var/lib/zarafa-webaccess-mobile/cache; if [-d $FILE ]; then /bin/chown -R www:www $FILE; fi
11     +FILE=/var/lib/zarafa-webaccess-mobile/templates_c; if [-d $FILE ]; then /bin/chown -R www:www $FILE; fi
12     +FILE=/etc/httpd/conf.d/zarafa-webaccess.conf; if [-a $FILE ]; then /bin/rm -f $FILE; fi
13     /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
14     /usr/bin/sv restart /service/httpd-e-smith
15    
16     diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-update smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-update
17     --- smeserver-zarafa-0.9.0/root/etc/e-smith/events/actions/zarafa-update 2010-02-11 20:49:41.000000000 +1100
18     +++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/events/actions/zarafa-update 2010-02-11 23:58:00.000000000 +1100
19     @@ -1,10 +1,12 @@
20     #!/bin/sh
21    
22     # update files controled by upstream sources
23     -/bin/mkdir -p /var/www/html/webaccess/tmp
24     -/bin/mkdir -p /var/www/html/z-push/state
25     -
26     -/bin/chown -R www:www /var/www/html/webaccess/tmp
27     -/bin/chmod 755 /var/www/html/z-push/state
28     -/bin/chown -R www:www /var/www/html/z-push/state
29     +/bin/chown -R www:www /var/lib/zarafa-webaccess/tmp
30     +FILE=/var/lib/zarafa-webaccess-mobile/cache; if [-d $FILE ]; then /bin/chown -R www:www $FILE; fi
31     +FILE=/var/lib/zarafa-webaccess-mobile/templates_c; if [-d $FILE ]; then /bin/chown -R www:www $FILE; fi
32     +FILE=/var/lib/zarafa/z-push/state; if [-d $FILE ]; then /bin/chown -R www:www $FILE; fi
33     +FILE=/etc/httpd/conf.d/zarafa-webaccess.conf; if [-a $FILE ]; then /bin/rm -f $FILE; fi
34     +/bin/chown -R www:www /var/lib/zarafa/z-push/state
35     +/bin/rm -f /etc/httpd/conf.d/zarafa-webaccess.conf
36     +
37    
38     diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias
39     --- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2010-02-11 20:49:41.000000000 +1100
40     +++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86ZarafaAlias 2010-02-11 21:22:57.000000000 +1100
41     @@ -6,8 +6,8 @@
42     $OUT .= qq(
43     # Zarafa specific configuration files.
44    
45     - Alias /zarafa /var/www/html/webaccess/
46     - <Directory /var/www/html/webaccess/>
47     + Alias /zarafa /usr/share/zarafa-webaccess/
48     + <Directory /usr/share/zarafa-webaccess/>
49     Options -Indexes
50     AllowOverride None
51     order allow,deny
52     diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases
53     --- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases 2010-02-11 20:49:41.000000000 +1100
54     +++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29ZarafaAliases 2010-02-11 21:22:23.000000000 +1100
55     @@ -6,11 +6,11 @@
56     my $zwebmailAccessType = $zarafa{'access'} || "SSL";
57    
58     my $dirs;
59     - $dirs{zarafa} = '/var/www/html/webaccess';
60     - $dirs{webaccess} = '/var/www/html/webaccess';
61     - $dirs{webmail} = '/var/www/html/webaccess';
62     + $dirs{zarafa} = '/usr/share/zarafa-webaccess';
63     + $dirs{webaccess} = '/usr/share/zarafa-webaccess';
64     + $dirs{webmail} = '/usr/share/zarafa-webaccess';
65     if ($imp{'status'} eq 'enabled') {$dirs{webmail} = ''};
66     - $dirs{mobile} = '/var/www/html/webaccess-mobile';
67     + $dirs{mobile} = '/usr/share/zarafa-webaccess-mobile';
68     $dirs{'Microsoft-Server-ActiveSync'} = '/var/www/html/z-push/index.php';
69    
70     return " # Zarafa is disabled in this VirtualHost\n"
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed