/[smecontribs]/rpms/smeserver-nextcloud/contribs9/smeserver-nextcloud-1.1.0-bz10728-OCC512.patch
ViewVC logotype

Annotation of /rpms/smeserver-nextcloud/contribs9/smeserver-nextcloud-1.1.0-bz10728-OCC512.patch

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


Revision 1.1 - (hide annotations) (download)
Sun Feb 17 05:27:58 2019 UTC (5 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_1_0-19_el6_sme, smeserver-nextcloud-1_1_0-15_el6_sme, smeserver-nextcloud-1_1_0-17_el6_sme, smeserver-nextcloud-1_1_0-14_el6_sme, smeserver-nextcloud-1_1_0-20_el6_sme, smeserver-nextcloud-1_1_0-18_el6_sme, smeserver-nextcloud-1_1_0-21_el6_sme, smeserver-nextcloud-1_1_0-16_el6_sme, HEAD
* Sun Feb 17 2019 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-14.sme
- fix 512MB error on events [SME: 10728]
- add requirement for inotify support [SME: 10733]

1 jpp 1.1 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-conf smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-conf
2     --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-conf 2018-04-01 17:23:58.000000000 -0400
3     +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-conf 2019-02-17 00:20:18.230000000 -0500
4     @@ -5,7 +5,7 @@
5     params=$@;
6     source /opt/remi/php71/enable
7     cd /usr/share/nextcloud/
8     - TERM=dumb runuser -s /bin/bash apache -c "./occ $params"
9     + TERM=dumb /usr/bin/OCC $params
10     }
11    
12     # check if inodb is enabled for up to SME9, if not do it.
13     @@ -60,4 +60,4 @@
14     if [ $? -eq 3 ]; then
15     exit 0
16     fi
17     -fi
18     \ Pas de fin de ligne à la fin du fichier
19     +fi
20     diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-del-user smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-del-user
21     --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-del-user 2018-04-01 17:23:58.000000000 -0400
22     +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-del-user 2019-02-17 00:19:51.289000000 -0500
23     @@ -30,7 +30,7 @@
24     sub OCCr
25     {
26     my $params = join(" ", @_);
27     - my $json =`TERM=dumb su - apache -s /bin/bash -c "source /opt/remi/php71/enable; cd /usr/share/nextcloud/; php occ $params"` ;
28     + my $json =`TERM=dumb /usr/bin/OCC $params` ;
29     return $json;
30     }
31    
32     diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-occ-conf
33     --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf 2019-02-17 00:06:33.990000000 -0500
34     +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2019-02-17 00:21:12.655000000 -0500
35     @@ -10,13 +10,13 @@
36     sub OCC
37     {
38     my $params = join(" ", @_);
39     - system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php71/enable; cd /usr/share/nextcloud/; php occ $params\"");
40     + system("TERM=dumb /usr/bin/OCC $params");
41     }
42    
43     sub OCCr
44     {
45     my $params = join(" ", @_);
46     - my $json =`TERM=dumb su - apache -s /bin/bash -c "source /opt/remi/php71/enable; cd /usr/share/nextcloud/; php occ $params"` ;
47     + my $json =`TERM=dumb /usr/bin/OCC $params` ;
48     $json =~ s/\s+$//;
49     return $json;
50     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed