/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz11920-bz11854-bz11973.patch
ViewVC logotype

Annotation of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz11920-bz11854-bz11973.patch

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

Revision 1.1 - (hide annotations) (download)
Thu May 19 03:22:22 2022 UTC (2 years, 5 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_2_0-29_el7_sme, smeserver-nextcloud-1_2_0-22_el7_sme, smeserver-nextcloud-1_2_0-13_el7_sme, smeserver-nextcloud-1_2_0-19_el7_sme, smeserver-nextcloud-1_2_0-26_el7_sme, smeserver-nextcloud-1_2_0-27_el7_sme, smeserver-nextcloud-1_2_0-31_el7_sme, smeserver-nextcloud-1_2_0-24_el7_sme, smeserver-nextcloud-1_2_0-30_el7_sme, smeserver-nextcloud-1_2_0-17_el7_sme, smeserver-nextcloud-1_2_0-25_el7_sme, smeserver-nextcloud-1_2_0-20_el7_sme, smeserver-nextcloud-1_2_0-16_el7_sme, smeserver-nextcloud-1_2_0-23_el7_sme, smeserver-nextcloud-1_2_0-21_el7_sme, smeserver-nextcloud-1_2_0-15_el7_sme, smeserver-nextcloud-1_2_0-12_el7_sme, smeserver-nextcloud-1_2_0-18_el7_sme, smeserver-nextcloud-1_2_0-14_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, HEAD 
* Wed May 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-12.sme
- use php_pecl-apcu for cli [SME: 11920]
- db update of keys and indexes [SME: 11854]
- few nextcloud-occ-conf fixes [SME: 11973]
  make occ used in scripts rather than OCC
1 jpp 1.1 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-conf smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf
2     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-conf 2022-05-18 20:03:40.462000000 -0400
3     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-conf 2022-05-18 20:11:51.606000000 -0400
4     @@ -5,7 +5,7 @@
5     params=$@;
6     source /opt/remi/php74/enable
7     cd /usr/share/nextcloud/
8     - TERM=dumb /usr/bin/OCC $params
9     + TERM=dumb /usr/bin/occ $params
10     }
11    
12     # important configuration variables
13     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-del-user smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-del-user
14     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-del-user 2020-11-08 15:21:24.000000000 -0500
15     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-del-user 2022-05-18 20:13:03.451000000 -0400
16     @@ -30,7 +30,7 @@
17     sub OCCr
18     {
19     my $params = join(" ", @_);
20     - my $json =`TERM=dumb /usr/bin/OCC $params` ;
21     + my $json =`TERM=dumb /usr/bin/occ $params` ;
22     return $json;
23     }
24    
25     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf
26     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-05-18 20:03:40.463000000 -0400
27     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-05-18 20:15:56.429000000 -0400
28     @@ -10,13 +10,13 @@
29     sub OCC
30     {
31     my $params = join(" ", @_);
32     - system("TERM=dumb /usr/bin/OCC $params");
33     + system("TERM=dumb /usr/bin/occ $params");
34     }
35    
36     sub OCCr
37     {
38     my $params = join(" ", @_);
39     - my $json =`TERM=dumb /usr/bin/OCC $params` ;
40     + my $json =`TERM=dumb /usr/bin/occ $params` ;
41     $json =~ s/\s+$//;
42     return $json;
43     }
44     @@ -285,7 +285,7 @@
45     if (scalar(@{$localmounts{$id}{'applicable_groups'}}) >0 || scalar(@{$localmounts{$id}{'applicable_users'}}) >1 || scalar(@{$localmounts{$id}{'applicable_users'}}) == 0 || $localmounts{$id}{'applicable_users'}[0] ne $user) {
46     print "updating $key\n";
47     OCC "files_external:applicable --remove-all $id";
48     - OCC "files_external:applicable --add-users $user $id" ;
49     + OCC "files_external:applicable --add-user $user $id" ;
50     }
51     push @idOK,$id;
52    
53     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/crontab/98nextcloud
54     --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud 2020-11-08 15:21:24.000000000 -0500
55     +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/crontab/98nextcloud 2022-05-18 20:11:10.786000000 -0400
56     @@ -1,5 +1,5 @@
57     # nextcloud cron
58     -*/15 * * * * www scl enable php74 'php --define memory_limit=512M -f /usr/share/nextcloud/cron.php > /dev/null 2>&1'
59     +*/15 * * * * www scl enable php74 'php --define apc.enable_cli=1 --define memory_limit=512M -f /usr/share/nextcloud/cron.php > /dev/null 2>&1'
60    
61     # nextcloud db update
62     -19 2 * * * www cd /usr/share/nextcloud ; echo 'y' | scl enable php74 'php --define memory_limit=512M occ db:convert-filecache-bigint > /dev/null 2>&1'
63     +19 2 * * * root /usr/bin/nc_dbupdate > /dev/null 2>&1'
64     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/usr/bin/nc_dbupdate smeserver-nextcloud-1.2.0/root/usr/bin/nc_dbupdate
65     --- smeserver-nextcloud-1.2.0.old/root/usr/bin/nc_dbupdate 1969-12-31 19:00:00.000000000 -0500
66     +++ smeserver-nextcloud-1.2.0/root/usr/bin/nc_dbupdate 2022-05-18 20:14:10.402000000 -0400
67     @@ -0,0 +1,5 @@
68     +#!/bin/bash
69     +
70     +/usr/bin/occ db:add-missing-indices
71     +/usr/bin/occ db:add-missing-primary-keys
72     +/usr/bin/occ db:convert-filecache-bigint
73     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/usr/bin/OCC smeserver-nextcloud-1.2.0/root/usr/bin/OCC
74     --- smeserver-nextcloud-1.2.0.old/root/usr/bin/OCC 2020-11-08 15:21:24.000000000 -0500
75     +++ smeserver-nextcloud-1.2.0/root/usr/bin/OCC 2022-05-18 20:13:50.341000000 -0400
76     @@ -1,5 +1,4 @@
77     -# cat bin/OCC
78     #!/bin/bash
79    
80     cd /usr/share/nextcloud
81     -sudo -u www -s /usr/bin/php74 --define memory_limit=512M occ $@
82     +sudo -u www -s /usr/bin/php74 --define apc.enable_cli=1 --define memory_limit=512M occ $@
83     diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/usr/bin/occ smeserver-nextcloud-1.2.0/root/usr/bin/occ
84     --- smeserver-nextcloud-1.2.0.old/root/usr/bin/occ 2022-05-18 20:03:40.459000000 -0400
85     +++ smeserver-nextcloud-1.2.0/root/usr/bin/occ 2022-05-18 20:13:39.263000000 -0400
86     @@ -1,5 +1,4 @@
87     -# cat bin/OCC
88     #!/bin/bash
89    
90     cd /usr/share/nextcloud
91     -sudo -u www -s /usr/bin/php74 --define memory_limit=512M occ $@
92     +sudo -u www -s /usr/bin/php74 --define apc.enable_cli=1 --define memory_limit=512M occ $@
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed