/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz11890-runuser.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz11890-runuser.patch

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


Revision 1.2 - (show annotations) (download)
Sat Jan 21 13:50:42 2023 UTC (15 months, 1 week ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_2_0-29_el7_sme, smeserver-nextcloud-1_2_0-26_el7_sme, smeserver-nextcloud-1_2_0-27_el7_sme, smeserver-nextcloud-1_2_0-24_el7_sme, smeserver-nextcloud-1_2_0-30_el7_sme, smeserver-nextcloud-1_2_0-25_el7_sme, smeserver-nextcloud-1_2_0-23_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, HEAD
Changes since 1.1: +1 -1 lines
* Sat Jan 21 2023 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-23.sme
- typo fix [SME: 11890]

1 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
2 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-del-user 2023-01-10 23:56:29.524000000 -0500
3 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-del-user 2023-01-10 23:58:45.574000000 -0500
4 @@ -85,13 +85,13 @@
5 # delete user home access
6 my @matching_keys = grep { defined $localmounts{$_}{'host'} && $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/$userName$/} keys %localmounts;
7 while (my $bad = pop @matching_keys) {
8 - system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php74/enable; cd /usr/share/nextcloud/; php occ files_external:delete $bad -y \"") == 0
9 + system("TERM=dumb /usr/bin/occ files_external:delete -y $bad ") == 0
10 or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" );
11
12 }
13
14 # delete user
15 -system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php74/enable; cd /usr/share/nextcloud/; php occ user:delete $id -y \"") == 0
16 +system("TERM=dumb /usr/bin/occ user:delete -y $id ") == 0
17 or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" ) if ($id ne "");
18
19 exit($x);
20 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
21 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud 2023-01-10 23:56:29.531000000 -0500
22 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/crontab/98nextcloud 2023-01-11 00:01:22.280000000 -0500
23 @@ -1,5 +1,5 @@
24 # nextcloud cron
25 -*/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'
26 +*/15 * * * * www /usr/bin/php74 --define apc.enable_cli=1 --define memory_limit=512M -f /usr/share/nextcloud/cron.php > /dev/null 2>&1
27
28 # nextcloud db update
29 19 2 * * * root /usr/bin/nc_dbupdate > /dev/null 2>&1
30 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/usr/bin/OCC smeserver-nextcloud-1.2.0/root/usr/bin/OCC
31 --- smeserver-nextcloud-1.2.0.old/root/usr/bin/OCC 2023-01-10 23:56:29.525000000 -0500
32 +++ smeserver-nextcloud-1.2.0/root/usr/bin/OCC 1969-12-31 19:00:00.000000000 -0500
33 @@ -1,4 +0,0 @@
34 -#!/bin/bash
35 -
36 -cd /usr/share/nextcloud
37 -sudo -u www -s /usr/bin/php74 --define apc.enable_cli=1 --define memory_limit=512M occ $@
38 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/usr/bin/occ smeserver-nextcloud-1.2.0/root/usr/bin/occ
39 --- smeserver-nextcloud-1.2.0.old/root/usr/bin/occ 2023-01-10 23:56:29.525000000 -0500
40 +++ smeserver-nextcloud-1.2.0/root/usr/bin/occ 2023-01-10 23:57:04.299000000 -0500
41 @@ -1,4 +1,3 @@
42 #!/bin/bash
43
44 -cd /usr/share/nextcloud
45 -sudo -u www -s /usr/bin/php74 --define apc.enable_cli=1 --define memory_limit=512M occ $@
46 +/usr/sbin/runuser -u www -- /usr/bin/php74 -d memory_limit=1024M -d apc.enable_cli=1 /usr/share/nextcloud/occ "$@"

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