diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/db/configuration/migrate/nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/db/configuration/migrate/nextcloud --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/db/configuration/migrate/nextcloud 2018-03-30 16:04:52.000000000 -0400 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/db/configuration/migrate/nextcloud 2022-07-07 21:35:37.020000000 -0400 @@ -6,6 +6,10 @@ $nextcloud->set_prop('DbPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`); my $dbAdminPass = $nextcloud->prop('AdminPassword') || $nextcloud->set_prop('AdminPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`); + +if (my $CloudDomain = $DB->get_prop_and_delete('nextcloud', 'CloudDomain')) { + $nextcloud->merge_props('VirtualHost', $CloudDomain); + } } 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-07-07 21:26:47.694000000 -0400 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2022-07-07 21:28:58.842000000 -0400 @@ -104,8 +104,8 @@ OCC "config:system:set trusted_domains $i --value=".$_; $i++; } -my $CloudDomain = $cdb->get_prop('nextcloud','CloudDomain') || ''; -OCC "config:system:set trusted_domains 99 --value=$CloudDomain" unless $CloudDomain eq ""; +my $VirtualHost = $cdb->get_prop('nextcloud','VirtualHost') || ''; +OCC "config:system:set trusted_domains 99 --value=$VirtualHost" unless $VirtualHost eq ""; # enable files_external and allow auto refresh OCC "app:enable files_external"; diff -Nur --no-dereference smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud 2022-07-07 21:26:47.684000000 -0400 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud 2022-07-07 21:30:28.286000000 -0400 @@ -3,7 +3,7 @@ # { - my $CloudDomain = $nextcloud{'CloudDomain'} || 'none'; + my $CloudDomain = $nextcloud{'VirtualHost'} || 'none';#using CloudDomain, not to confuse for the template virtualHost variable $OUT = ''; if ((${'nextcloud'}{'status'} || 'disabled') eq 'enabled' ){