/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz12208-bz12187-bz12241.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0-bz12208-bz12187-bz12241.patch

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


Revision 1.1 - (show annotations) (download)
Thu Nov 24 02:17:51 2022 UTC (17 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-22_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-20_el7_sme, smeserver-nextcloud-1_2_0-23_el7_sme, smeserver-nextcloud-1_2_0-21_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, HEAD
* Wed Nov 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-20.sme
- set overwrite.cli.url [SME: 12208]
- allow shell_exec [SME: 12187]
- fix username conflict with group name [SME: 12241]

1 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
2 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-11-23 20:51:07.803000000 -0500
3 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-11-23 21:09:48.513000000 -0500
4 @@ -104,9 +104,16 @@
5 OCC "config:system:set trusted_domains $i --value=".$_;
6 $i++;
7 }
8 +
9 my $VirtualHost = $cdb->get_prop('nextcloud','VirtualHost') || '';
10 OCC "config:system:set trusted_domains 99 --value=$VirtualHost" unless $VirtualHost eq "";
11
12 +#set local domain to send emails
13 +if ( ($nextcloud->prop('cliurl') ||'enabled') eq 'enabled') {
14 + my $url= ($VirtualHost eq "")? "$domain/nextcloud" : $VirtualHost;
15 + OCC "config:system:set overwrite.cli.url --value 'https://$url'"
16 +}
17 +
18 # enable files_external and allow auto refresh
19 OCC "app:enable files_external";
20 OCC "config:system:set filesystem_check_changes --value=1";
21 @@ -178,7 +185,7 @@
22 # get existing mount
23 %localmounts = listLocalMounts;
24 # search for our current one
25 - my @matching_keys = grep { $localmounts{$_}{'mount_point'} =~ m/ibays\/$key$/ && $localmounts{$_}{'storage'} eq $storage } keys %localmounts;
26 + my @matching_keys = grep { $localmounts{$_}{'mount_point'} =~ m/^ibays\/$key$/ && $localmounts{$_}{'storage'} eq $storage } keys %localmounts;
27
28 if (scalar(@matching_keys) == 0) {
29 #if none create
30 @@ -270,7 +277,7 @@
31 # get existing mount
32 %localmounts = listLocalMounts;
33 # search for our current one
34 - my @matching_keys = grep { $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/$key$/} keys %localmounts;
35 + my @matching_keys = grep { $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/^$key$/} keys %localmounts;
36
37 # if none create
38 if (scalar(@matching_keys) == 0) {
39 diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud
40 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2022-11-23 20:51:07.763000000 -0500
41 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2022-11-23 21:11:01.983000000 -0500
42 @@ -46,7 +46,7 @@
43 php_admin_value[max_execution_time] = 3600
44 php_admin_value[post_max_size] = $max_upload_size
45 php_admin_value[upload_max_filesize] = $max_upload_size
46 -php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
47 +php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, passthru, phpinfo, escapeshellarg, escapeshellcmd
48 php_admin_value[open_basedir] = $open_basedir
49 php_admin_flag[allow_url_fopen] = on
50 php_admin_flag[file_upload] = on

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