/[smecontribs]/rpms/smeserver-nextcloud/contribs9/smeserver-nextcloud-1.1.0.bz11003-php73.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs9/smeserver-nextcloud-1.1.0.bz11003-php73.patch

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

Revision 1.5 - (show annotations) (download)
Wed Nov 11 02:14:10 2020 UTC (3 years, 11 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_1_0-21_el6_sme, HEAD
Changes since 1.4: +0 -17 lines 
* Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-21.sme
- use php73-fpm [SME: 11003]
- Require php-gmp for Nextcloud 19 and newer [SME: 11004]
- add phpbasedir support so you can add individual access to dir or files [SME: 11083]
  simply use nextcloud PHPBaseDir property
- increase FastCgiExternalServer php pool timeout to 300 [SME: 11084]
- ease use of a dedicated domaine with https [SME: 10885]
1 diff -Nur smeserver-nextcloud-1.1.0.old/createlinks smeserver-nextcloud-1.1.0/createlinks
2 --- smeserver-nextcloud-1.1.0.old/createlinks 2020-11-08 10:29:10.080000000 -0500
3 +++ smeserver-nextcloud-1.1.0/createlinks 2020-11-08 10:42:05.233000000 -0500
4 @@ -9,15 +9,18 @@
5 event_templates("nextcloud-update", qw(
6 /etc/httpd/conf/httpd.conf
7 /etc/opt/remi/php72/php.d/20-opcache.ini
8 + /etc/opt/remi/php73/php.d/20-opcache.ini
9 /etc/crontab
10 /etc/opt/remi/php71/php-fpm.d/www.conf
11 /etc/opt/remi/php72/php-fpm.d/www.conf
12 + /etc/opt/remi/php73/php-fpm.d/www.conf
13 ));
14
15 event_services("nextcloud-update", qw(
16 httpd-e-smith sigusr1
17 php71-php-fpm reload
18 - php72-php-fpm restart
19 + php72-php-fpm reload
20 + php73-php-fpm restart
21 php-fpm reload
22 ));
23
24 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
25 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-conf 2020-11-08 10:29:10.080000000 -0500
26 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-conf 2020-11-08 10:39:36.117000000 -0500
27 @@ -3,7 +3,7 @@
28 function OCC
29 {
30 params=$@;
31 - source /opt/remi/php72/enable
32 + source /opt/remi/php73/enable
33 cd /usr/share/nextcloud/
34 TERM=dumb /usr/bin/OCC $params
35 }
36 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
37 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-del-user 2020-11-08 10:29:10.080000000 -0500
38 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-del-user 2020-11-08 10:39:36.119000000 -0500
39 @@ -85,13 +85,13 @@
40 # delete user home access
41 my @matching_keys = grep { defined $localmounts{$_}{'host'} && $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/$userName$/} keys %localmounts;
42 while (my $bad = pop @matching_keys) {
43 - system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php72/enable; cd /usr/share/nextcloud/; php occ files_external:delete $bad -y \"") == 0
44 + system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php73/enable; cd /usr/share/nextcloud/; php occ files_external:delete $bad -y \"") == 0
45 or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" );
46
47 }
48
49 # delete user
50 -system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php72/enable; cd /usr/share/nextcloud/; php occ user:delete $id -y \"") == 0
51 +system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php73/enable; cd /usr/share/nextcloud/; php occ user:delete $id -y \"") == 0
52 or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" ) if ($id ne "");
53
54 exit($x);
55 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/crontab/98nextcloud
56 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud 2020-11-08 10:29:10.081000000 -0500
57 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/crontab/98nextcloud 2020-11-08 10:39:36.119000000 -0500
58 @@ -1,5 +1,5 @@
59 # nextcloud cron
60 -*/15 * * * * www scl enable php72 'php --define memory_limit=512M -f /usr/share/nextcloud/cron.php > /dev/null 2>&1'
61 +*/15 * * * * www scl enable php73 'php --define memory_limit=512M -f /usr/share/nextcloud/cron.php > /dev/null 2>&1'
62
63 # nextcloud db update
64 -19 2 * * * www cd /usr/share/nextcloud ; echo 'y' | scl enable php72 'php --define memory_limit=512M occ db:convert-filecache-bigint > /dev/null 2>&1'
65 +19 2 * * * www cd /usr/share/nextcloud ; echo 'y' | scl enable php73 'php --define memory_limit=512M occ db:convert-filecache-bigint > /dev/null 2>&1'
66 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15nextcloud smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15nextcloud
67 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15nextcloud 2020-11-08 10:29:10.081000000 -0500
68 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15nextcloud 2020-11-08 10:39:36.119000000 -0500
69 @@ -3,7 +3,7 @@
70 $OUT .=<<_EOF;
71 Action phpnextcloud-fastcgi /php-cgi-bin/phpnextcloud-wrapper
72 Alias /php-cgi-bin/phpnextcloud-wrapper /var/www/php-cgi-bin/phpnextcloud-wrapper
73 -FastCgiExternalServer /var/www/php-cgi-bin/phpnextcloud-wrapper -socket /var/run/php-fpm/php72-nextcloud.sock -pass-header Authorization -idle-timeout 120
74 +FastCgiExternalServer /var/www/php-cgi-bin/phpnextcloud-wrapper -socket /var/run/php-fpm/php73-nextcloud.sock -pass-header Authorization -idle-timeout 120
75 _EOF
76 }
77 }
78 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud
79 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2020-11-08 10:29:10.082000000 -0500
80 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2020-11-08 10:39:36.119000000 -0500
81 @@ -48,7 +48,7 @@
82 elsif ($fascgi_mod eq 'mod_proxy_fcgi'){
83 $php =<<'_EOF';
84 <FilesMatch \.php$>
85 - SetHandler "proxy:unix:/var/run/php-fpm/php72-nextcloud.sock|fcgi://localhost"
86 + SetHandler "proxy:unix:/var/run/php-fpm/php73-nextcloud.sock|fcgi://localhost"
87 </FilesMatch>
88 _EOF
89 }
90 diff -Nur smeserver-nextcloud-1.1.0.old/root/usr/bin/OCC smeserver-nextcloud-1.1.0/root/usr/bin/OCC
91 --- smeserver-nextcloud-1.1.0.old/root/usr/bin/OCC 2020-11-08 10:29:10.081000000 -0500
92 +++ smeserver-nextcloud-1.1.0/root/usr/bin/OCC 2020-11-08 10:39:36.119000000 -0500
93 @@ -2,4 +2,4 @@
94 #!/bin/bash
95
96 cd /usr/share/nextcloud
97 -sudo -u www -s /usr/bin/php72 --define memory_limit=512M occ $@
98 +sudo -u www -s /usr/bin/php73 --define memory_limit=512M occ $@
99 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/opt/remi/php73/php.d/20-opcache.ini/10base smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/opt/remi/php73/php.d/20-opcache.ini/10base
100 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/opt/remi/php73/php.d/20-opcache.ini/10base 1969-12-31 19:00:00.000000000 -0500
101 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/opt/remi/php73/php.d/20-opcache.ini/10base 2018-03-20 07:10:08.000000000 -0400
102 @@ -0,0 +1,7 @@
103 +opcache.enable=1
104 +opcache.enable_cli=1
105 +opcache.interned_strings_buffer=8
106 +opcache.max_accelerated_files=10000
107 +opcache.memory_consumption=128
108 +opcache.save_comments=1
109 +opcache.revalidate_freq=1
110 diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud
111 --- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-11-09 23:33:07.701000000 -0500
112 +++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-11-09 23:34:42.905000000 -0500
113 @@ -1,6 +1,6 @@
114 {
115
116 -if ($PHP_VERSION eq '72'){
117 +if ($PHP_VERSION eq '73'){
118 if (($nextcloud{'status'} || 'disabled') eq 'enabled'){
119 my $max_upload_size = ($nextcloud{MaxUploadSize} || '4096');
120 $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed