fixes (#1701)

nextcloud-startup-script.sh

@@ -494,6 +494,7 @@ rm -f "$SCRIPTS/server_configuration.sh"
 rm -f "$SCRIPTS/nextcloud_configuration.sh"
 rm -f "$SCRIPTS/additional_apps.sh"
 rm -f "$SCRIPTS/adduser.sh"
+rm -f "$NCDATA"/*.log
 
 find /root "/home/$UNIXUSER" -type f \( -name '*.sh*' -o -name '*.html*' -o -name '*.tar*' -o -name 'results' -o -name '*.zip*' \) -delete
 find "$NCPATH" -type f \( -name 'results' -o -name '*.sh*' \) -delete
@@ -506,7 +507,6 @@ truncate -s 0 \
     "/var/spool/mail/$UNIXUSER" \
     /var/log/apache2/access.log \
     /var/log/apache2/error.log \
-    /var/log/cronjobs_success.log \
     "$VMLOGS/nextcloud.log"
 
 sed -i "s|sudo -i||g" "$UNIXUSER_PROFILE"
@@ -572,7 +572,9 @@ or buy a yearly subscription from Nextcloud:
 BUGS:
 Please report any bugs here: https://github.com/nextcloud/vm/issues"
 
-msg_box "Congratulations! You have successfully installed Nextcloud!
+msg_box "### PLEASE HIT OK TO REBOOT ###
+
+Congratulations! You have successfully installed Nextcloud!
 
 LOGIN:
 Login to Nextcloud in your browser:

nextcloud_update.sh

@@ -115,11 +115,28 @@ for upgrading your server: https://shop.hanssonit.se/product/premium-support-per
     exit 0
 fi
 
+# Set secure permissions
+if [ ! -f "$SECURE" ]
+then
+    mkdir -p "$SCRIPTS"
+    download_script STATIC setup_secure_permissions_nextcloud
+    chmod +x "$SECURE"
+else
+    rm "$SECURE"
+    download_script STATIC setup_secure_permissions_nextcloud
+    chmod +x "$SECURE"
+fi
+
 # Move all logs to new dir (2019-09-04)
+bash $SECURE & spinner_loading
 if [ -d /var/log/ncvm/ ]
 then
     rsync -Aaxz /var/log/ncvm/ $VMLOGS
     rm -Rf /var/log/ncvm/
+    rm -f "$NCDATA"/*.log
+else
+    rsync -Aaxz "$NCDATA"/*.log $VMLOGS
+    rm -f "$NCDATA"/*.log
 fi
 
 # Remove the local lib.sh since it's causing issues with new functions (2020-06-01)
@@ -347,18 +364,6 @@ then
    fi
 fi
 
-# Set secure permissions
-if [ ! -f "$SECURE" ]
-then
-    mkdir -p "$SCRIPTS"
-    download_script STATIC setup_secure_permissions_nextcloud
-    chmod +x "$SECURE"
-else
-    rm "$SECURE"
-    download_script STATIC setup_secure_permissions_nextcloud
-    chmod +x "$SECURE"
-fi
-
 # Update all Nextcloud apps
 if [ "${CURRENTVERSION%%.*}" -ge "15" ]
 then
@@ -734,7 +739,7 @@ print_text_in_color "$ICyan" "Setting RewriteBase to \"/\" in config.php..."
 chown -R www-data:www-data "$NCPATH"
 nextcloud_occ config:system:set htaccess.RewriteBase --value="/"
 nextcloud_occ maintenance:update:htaccess
-bash "$SECURE"
+bash $SECURE & spinner_loading
 
 # Repair
 nextcloud_occ maintenance:repair

static/index.php

@@ -80,7 +80,7 @@
         <br>
         <div class="information">
             <p>Thank you for downloading the Nextcloud VM, you made a good choice! If you see this page, you have run the first setup, and you are now ready to start using Nextcloud on your new server. Congratulations! :)</p>
-            <p>We have set everything up for you and the only thing you have to do now is to login. You can find login details in the middle of this page.</p>
+            <p>We have prepared everything for you, and the only thing you have to do now is to login. You can find login details further down in this page.</p>
             <p>Don't hesitate to ask if you have any questions. You can ask for help in our community <a href="https://help.nextcloud.com/c/support/appliances-docker-snappy-vm" target="_blank">support</a> channels, or <a href="https://shop.hanssonit.se/product/premium-support-per-30-minutes/" target="_blank">buy hands on support</a> from T&M Hansson IT AB. You can also check the <a href="https://docs.hanssonit.se/s/W6fMouPiqQz3_Mog/virtual-machines-vm/d/W7Du9uPiqQz3_Mr1/nextcloud-vm-machine-configuration" target="_blank">documentation</a>.</p>
         </div>
 
@@ -128,7 +128,7 @@
                     <li><a href="https://<?=$_SERVER['SERVER_NAME'];?>:9443">https://<?=$_SERVER['SERVER_NAME'];?>:9443</a> (HTTPS)</li>
                 </ul>
             </h3>
-            <p>Note: Please accept the warning in the browser if you connect via HTTPS.</p>
+            <p>Note: Please accept the warning in the browser if you have a self-signed certificate.<br>
             <h3>
                 <a href="https://docs.hanssonit.se/s/W6fMouPiqQz3_Mog/virtual-machines-vm/d/W6fMquPiqQz3_Moi/nextcloud-vm-first-setup-instructions?currentPageId=W6ypBePiqQz3_Mp0" target="_blank">Login details</a>
             </h3>

static/setup_secure_permissions_nextcloud.sh

@@ -78,7 +78,7 @@ then
     # Always chown root dir
     chown "${htuser}":"${htgroup}" "${NCDATA}"/
     # Check subdirs as well
-    if find "${NCDATA}" -mindepth 1 -type d -exec stat --printf='%U:%G\n' {} \; | grep -v "${htuser}:${htgroup}"
+    if find "${NCDATA}" -maxdepth 4 -type d -exec stat --printf='%U:%G\n' {} \; | grep -v "${htuser}:${htgroup}"
     then
         chown -R "${htuser}":"${htgroup}" "${NCDATA}"/
     fi