From 7dfbbb70da2f322d772dc3bbe1950fefa6b39664 Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Sun, 29 Nov 2020 02:27:40 +0100 Subject: [PATCH] fixes (#1701) --- nextcloud-startup-script.sh | 6 ++-- nextcloud_update.sh | 31 ++++++++++++-------- static/index.php | 4 +-- static/setup_secure_permissions_nextcloud.sh | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh index 47c2ddb2..44b82f23 100644 --- a/nextcloud-startup-script.sh +++ b/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: diff --git a/nextcloud_update.sh b/nextcloud_update.sh index e95adc21..67705fcd 100644 --- a/nextcloud_update.sh +++ b/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 diff --git a/static/index.php b/static/index.php index beea8b86..90b789b9 100644 --- a/static/index.php +++ b/static/index.php @@ -80,7 +80,7 @@

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! :)

-

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.

+

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.

Don't hesitate to ask if you have any questions. You can ask for help in our community support channels, or buy hands on support from T&M Hansson IT AB. You can also check the documentation.

@@ -128,7 +128,7 @@
  • https://:9443 (HTTPS)
    • -

    Note: Please accept the warning in the browser if you connect via HTTPS.

    +

    Note: Please accept the warning in the browser if you have a self-signed certificate.

    Login details

    diff --git a/static/setup_secure_permissions_nextcloud.sh b/static/setup_secure_permissions_nextcloud.sh index eb00815f..7bff1f16 100644 --- a/static/setup_secure_permissions_nextcloud.sh +++ b/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