| 1 |
jpp |
1.1 |
diff -Nur smeserver-nextcloud-1.1.0.old/createlinks smeserver-nextcloud-1.1.0/createlinks |
| 2 |
|
|
--- smeserver-nextcloud-1.1.0.old/createlinks 2019-12-16 17:30:42.388000000 -0500 |
| 3 |
|
|
+++ smeserver-nextcloud-1.1.0/createlinks 2019-12-16 17:42:53.120000000 -0500 |
| 4 |
|
|
@@ -8,14 +8,16 @@ |
| 5 |
|
|
|
| 6 |
|
|
event_templates("nextcloud-update", qw( |
| 7 |
|
|
/etc/httpd/conf/httpd.conf |
| 8 |
|
|
- /etc/opt/remi/php71/php.d/20-opcache.ini |
| 9 |
|
|
+ /etc/opt/remi/php72/php.d/20-opcache.ini |
| 10 |
|
|
/etc/crontab |
| 11 |
|
|
/etc/opt/remi/php71/php-fpm.d/www.conf |
| 12 |
|
|
+ /etc/opt/remi/php72/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 |
|
|
php-fpm reload |
| 20 |
|
|
)); |
| 21 |
|
|
|
| 22 |
|
|
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 |
| 23 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-conf 2019-12-16 17:30:42.419000000 -0500 |
| 24 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-conf 2019-12-16 17:37:51.033000000 -0500 |
| 25 |
|
|
@@ -3,7 +3,7 @@ |
| 26 |
|
|
function OCC |
| 27 |
|
|
{ |
| 28 |
|
|
params=$@; |
| 29 |
|
|
- source /opt/remi/php71/enable |
| 30 |
|
|
+ source /opt/remi/php72/enable |
| 31 |
|
|
cd /usr/share/nextcloud/ |
| 32 |
|
|
TERM=dumb /usr/bin/OCC $params |
| 33 |
|
|
} |
| 34 |
|
|
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 |
| 35 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/events/actions/nextcloud-del-user 2019-12-16 17:30:42.419000000 -0500 |
| 36 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/events/actions/nextcloud-del-user 2019-12-16 17:38:21.078000000 -0500 |
| 37 |
|
|
@@ -85,13 +85,13 @@ |
| 38 |
|
|
# delete user home access |
| 39 |
|
|
my @matching_keys = grep { defined $localmounts{$_}{'host'} && $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/$userName$/} keys %localmounts; |
| 40 |
|
|
while (my $bad = pop @matching_keys) { |
| 41 |
|
|
- system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php71/enable; cd /usr/share/nextcloud/; php occ files_external:delete $bad -y \"") == 0 |
| 42 |
|
|
+ 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 |
| 43 |
|
|
or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" ); |
| 44 |
|
|
|
| 45 |
|
|
} |
| 46 |
|
|
|
| 47 |
|
|
# delete user |
| 48 |
|
|
-system("TERM=dumb su - apache -s /bin/bash -c \"source /opt/remi/php71/enable; cd /usr/share/nextcloud/; php occ user:delete $id -y \"") == 0 |
| 49 |
|
|
+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 |
| 50 |
|
|
or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" ) if ($id ne ""); |
| 51 |
|
|
|
| 52 |
|
|
exit($x); |
| 53 |
|
|
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 |
| 54 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/crontab/98nextcloud 2019-12-16 17:30:42.416000000 -0500 |
| 55 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/crontab/98nextcloud 2019-12-16 17:39:58.087000000 -0500 |
| 56 |
|
|
@@ -1,5 +1,5 @@ |
| 57 |
|
|
# nextcloud cron |
| 58 |
|
|
-*/15 * * * * www scl enable php71 'php --define memory_limit=512M -f /usr/share/nextcloud/cron.php > /dev/null 2>&1' |
| 59 |
|
|
+*/15 * * * * www scl enable php72 'php --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 php71 'php --define memory_limit=512M occ db:convert-filecache-bigint > /dev/null 2>&1' |
| 63 |
|
|
+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' |
| 64 |
|
|
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 |
| 65 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15nextcloud 2018-03-30 19:51:13.000000000 -0400 |
| 66 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15nextcloud 2019-12-16 17:38:56.127000000 -0500 |
| 67 |
|
|
@@ -3,7 +3,7 @@ |
| 68 |
|
|
$OUT .=<<_EOF; |
| 69 |
|
|
Action phpnextcloud-fastcgi /php-cgi-bin/phpnextcloud-wrapper |
| 70 |
|
|
Alias /php-cgi-bin/phpnextcloud-wrapper /var/www/php-cgi-bin/phpnextcloud-wrapper |
| 71 |
|
|
-FastCgiExternalServer /var/www/php-cgi-bin/phpnextcloud-wrapper -socket /var/run/php-fpm/php71-nextcloud.sock -pass-header Authorization -idle-timeout 120 |
| 72 |
|
|
+FastCgiExternalServer /var/www/php-cgi-bin/phpnextcloud-wrapper -socket /var/run/php-fpm/php72-nextcloud.sock -pass-header Authorization -idle-timeout 120 |
| 73 |
|
|
_EOF |
| 74 |
|
|
} |
| 75 |
|
|
} |
| 76 |
|
|
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 |
| 77 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2019-12-16 17:30:42.404000000 -0500 |
| 78 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2019-12-16 17:39:10.046000000 -0500 |
| 79 |
|
|
@@ -48,7 +48,7 @@ |
| 80 |
|
|
elsif ($fascgi_mod eq 'mod_proxy_fcgi'){ |
| 81 |
|
|
$php =<<'_EOF'; |
| 82 |
|
|
<FilesMatch \.php$> |
| 83 |
|
|
- SetHannextclouder "proxy:unix:/var/run/php-fpm/php71-nextcloud.sock|fcgi://localhost" |
| 84 |
|
|
+ SetHannextclouder "proxy:unix:/var/run/php-fpm/php72-nextcloud.sock|fcgi://localhost" |
| 85 |
|
|
</FilesMatch> |
| 86 |
|
|
_EOF |
| 87 |
|
|
} |
| 88 |
|
|
diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/opt/remi/php71/php.d/20-opcache.ini/10base smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/opt/remi/php71/php.d/20-opcache.ini/10base |
| 89 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/opt/remi/php71/php.d/20-opcache.ini/10base 2018-03-20 07:10:08.000000000 -0400 |
| 90 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/opt/remi/php71/php.d/20-opcache.ini/10base 1969-12-31 19:00:00.000000000 -0500 |
| 91 |
|
|
@@ -1,7 +0,0 @@ |
| 92 |
|
|
-opcache.enable=1 |
| 93 |
|
|
-opcache.enable_cli=1 |
| 94 |
|
|
-opcache.interned_strings_buffer=8 |
| 95 |
|
|
-opcache.max_accelerated_files=10000 |
| 96 |
|
|
-opcache.memory_consumption=128 |
| 97 |
|
|
-opcache.save_comments=1 |
| 98 |
|
|
-opcache.revalidate_freq=1 |
| 99 |
|
|
diff -Nur smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/opt/remi/php72/php.d/20-opcache.ini/10base smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/opt/remi/php72/php.d/20-opcache.ini/10base |
| 100 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/opt/remi/php72/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/php72/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 2019-12-16 17:30:42.401000000 -0500 |
| 112 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2019-12-16 17:39:42.345000000 -0500 |
| 113 |
|
|
@@ -1,6 +1,6 @@ |
| 114 |
|
|
{ |
| 115 |
|
|
|
| 116 |
|
|
-if ($PHP_VERSION eq '71'){ |
| 117 |
|
|
+if ($PHP_VERSION eq '72'){ |
| 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+$/); |
| 121 |
|
|
diff -Nur smeserver-nextcloud-1.1.0.old/root/usr/bin/OCC smeserver-nextcloud-1.1.0/root/usr/bin/OCC |
| 122 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/usr/bin/OCC 2019-12-16 17:30:42.408000000 -0500 |
| 123 |
|
|
+++ smeserver-nextcloud-1.1.0/root/usr/bin/OCC 2019-12-16 17:40:08.254000000 -0500 |
| 124 |
|
|
@@ -2,4 +2,4 @@ |
| 125 |
|
|
#!/bin/bash |
| 126 |
|
|
|
| 127 |
|
|
cd /usr/share/nextcloud |
| 128 |
|
|
-sudo -u www -s /usr/bin/php71 --define memory_limit=512M occ $@ |
| 129 |
|
|
+sudo -u www -s /usr/bin/php72 --define memory_limit=512M occ $@ |
| 130 |
jpp |
1.2 |
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 |
| 131 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2020-01-27 12:33:15.367000000 -0500 |
| 132 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud 2020-01-27 12:37:47.067000000 -0500 |
| 133 |
|
|
@@ -48,7 +48,7 @@ |
| 134 |
|
|
elsif ($fascgi_mod eq 'mod_proxy_fcgi'){ |
| 135 |
|
|
$php =<<'_EOF'; |
| 136 |
|
|
<FilesMatch \.php$> |
| 137 |
|
|
- SetHannextclouder "proxy:unix:/var/run/php-fpm/php72-nextcloud.sock|fcgi://localhost" |
| 138 |
|
|
+ SetHandler "proxy:unix:/var/run/php-fpm/php72-nextcloud.sock|fcgi://localhost" |
| 139 |
|
|
</FilesMatch> |
| 140 |
|
|
_EOF |
| 141 |
|
|
} |
| 142 |
|
|
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 |
| 143 |
|
|
--- smeserver-nextcloud-1.1.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-01-27 12:33:15.368000000 -0500 |
| 144 |
|
|
+++ smeserver-nextcloud-1.1.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-01-27 12:49:29.494000000 -0500 |
| 145 |
|
|
@@ -36,7 +36,7 @@ |
| 146 |
|
|
php_admin_value[max_execution_time] = 3600 |
| 147 |
|
|
php_admin_value[post_max_size] = $max_upload_size |
| 148 |
|
|
php_admin_value[upload_max_filesize] = $max_upload_size |
| 149 |
|
|
-php_admin_value[disable_functions] = system, show_source, symlink, exec, nextcloud, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd |
| 150 |
|
|
+php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd |
| 151 |
|
|
php_admin_value[open_basedir] = /usr/share/nextcloud:/var/lib/nextcloud:/var/log/nextcloud.log:/var/lib/php/nextcloud:/home/e-smith/files/nextcloud:/dev/urandom:/proc/meminfo |
| 152 |
|
|
php_admin_flag[allow_url_fopen] = on |
| 153 |
|
|
php_admin_flag[file_upload] = on |
Parent Directory
| 
Revision Log
| 
Revision Graph
