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
--- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf	2022-11-23 20:51:07.803000000 -0500
+++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf	2022-11-23 21:09:48.513000000 -0500
@@ -104,9 +104,16 @@
     OCC "config:system:set trusted_domains $i --value=".$_;
     $i++;
 }
+
 my $VirtualHost = $cdb->get_prop('nextcloud','VirtualHost') || '';
 OCC "config:system:set trusted_domains 99 --value=$VirtualHost" unless $VirtualHost eq "";
 
+#set local domain to send emails
+if ( ($nextcloud->prop('cliurl') ||'enabled') eq 'enabled') {
+    my $url= ($VirtualHost eq "")? "$domain/nextcloud" : $VirtualHost;
+    OCC "config:system:set overwrite.cli.url --value 'https://$url'"
+}
+
 # enable files_external and allow auto refresh
 OCC "app:enable files_external";
 OCC "config:system:set filesystem_check_changes --value=1";
@@ -178,7 +185,7 @@
   # get existing mount
   %localmounts = listLocalMounts;
   # search for our current one
-  my @matching_keys = grep { $localmounts{$_}{'mount_point'} =~ m/ibays\/$key$/ &&  $localmounts{$_}{'storage'} eq $storage } keys %localmounts;
+  my @matching_keys = grep { $localmounts{$_}{'mount_point'} =~ m/^ibays\/$key$/ &&  $localmounts{$_}{'storage'} eq $storage } keys %localmounts;
 
   if (scalar(@matching_keys) == 0) {
    #if none create
@@ -270,7 +277,7 @@
   # get existing mount
   %localmounts = listLocalMounts;
   # search for our current one
-  my @matching_keys = grep { $localmounts{$_}{'host'} =~ m/localhost$/  && $localmounts{$_}{'share'} =~ m/$key$/} keys %localmounts;
+  my @matching_keys = grep { $localmounts{$_}{'host'} =~ m/localhost$/  && $localmounts{$_}{'share'} =~ m/^$key$/} keys %localmounts;
 
   # if none create
   if (scalar(@matching_keys) == 0) {
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
--- 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
+++ 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
@@ -46,7 +46,7 @@
 php_admin_value[max_execution_time] = 3600
 php_admin_value[post_max_size] = $max_upload_size
 php_admin_value[upload_max_filesize] = $max_upload_size
-php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
+php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, passthru, phpinfo, escapeshellarg, escapeshellcmd
 php_admin_value[open_basedir] = $open_basedir
 php_admin_flag[allow_url_fopen] = on
 php_admin_flag[file_upload] = on