From df95dfe2e679965a424d398a1d0fc02ab37f4d25 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 26 Mar 2023 13:45:17 +0000 Subject: [PATCH 1/6] GitHub bot : changelog --- nextcloud/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index 47abd7564..fee0745ba 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,3 +1,5 @@ +### 26.0.0-2 (26-03-2023) +- Minor bugs fixed - Fix : connection with desktop client https://github.com/alexbelgium/hassio-addons/issues/771 - Improve : status check code - Fix : reinstallation code From b861e4ef21f19da6015fb5d0dd17359e15509cd6 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 26 Mar 2023 13:48:16 +0000 Subject: [PATCH 2/6] GitHub bot : graphs updated --- .github/starsevol.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/starsevol.svg b/.github/starsevol.svg index b7572b29c..633b8c8ac 100644 --- a/.github/starsevol.svg +++ b/.github/starsevol.svg @@ -1,4 +1,4 @@ AprilJulyOctober2022AprilJulyOctober2023 100200300400500600alexbelgium/hassio-addonsStar HistoryDateGitHub Stars \ No newline at end of file + }AprilJulyOctober2022AprilJulyOctober2023 100200300400500600alexbelgium/hassio-addonsStar HistoryDateGitHub Stars \ No newline at end of file From f67074ceb435f310ec2ef5c393ccefad0efaef34 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:50:29 +0200 Subject: [PATCH 3/6] Update CHANGELOG.md --- nextcloud/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index fee0745ba..ef5ad51b1 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,8 +1,8 @@ ### 26.0.0-2 (26-03-2023) - Minor bugs fixed - Fix : connection with desktop client https://github.com/alexbelgium/hassio-addons/issues/771 -- Improve : status check code -- Fix : reinstallation code +- Improve : status check code https://github.com/alexbelgium/hassio-addons/issues/768 +- Fix : reinstallation code https://github.com/alexbelgium/hassio-addons/issues/764 ## 26.0.0 (24-03-2023) @@ -19,7 +19,7 @@ - Minor bugs fixed - Implemented safety check that reinstalls nextcloud if issue detected https://github.com/alexbelgium/hassio-addons/issues/764 - Implemented healthcheck -- Redirect crond errors to addon logs +- Redirect crond errors to addon logs https://github.com/alexbelgium/hassio-addons/issues/752 - Improve elasticsearch integration - Links nginx & php logs with addon logs - Optimized nginx code to remove server error messages From 1c5eb5ae1a80bf62cb6b10f0fe03d9bf834b1dfe Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:53:32 +0200 Subject: [PATCH 4/6] Update 02-init_steps.sh --- .../rootfs/etc/cont-init.d/02-init_steps.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh index 129ec397a..f20a6a459 100755 --- a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh +++ b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh @@ -62,14 +62,14 @@ elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]]; then bashio::log.red "Issue in installation detected, Nextcloud will reinstall" bashio::log.red "--------------------------------------------------------" touch /reinstall -else - bashio::log.red "------------------------------------------------------------------" - bashio::log.red "Unknown error detected, please create issue in github or reinstall" - bashio::log.red "------------------------------------------------------------------" - bashio::log.red "Error message:" - bashio::log.red "$($LAUNCHER -V 2>&1)" - bashio::log.red "------------------------------------------------------------------" - bashio::exit.nok +#else +# bashio::log.red "------------------------------------------------------------------" +# bashio::log.red "Unknown error detected, please create issue in github or reinstall" +# bashio::log.red "------------------------------------------------------------------" +# bashio::log.red "Error message:" +# bashio::log.red "$($LAUNCHER -V 2>&1)" +# bashio::log.red "------------------------------------------------------------------" +# bashio::exit.nok fi ######################### From 8eb1060ac934906fa73b49d2e82c923eec150a17 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:54:14 +0200 Subject: [PATCH 5/6] Update CHANGELOG.md --- nextcloud/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index ef5ad51b1..17966d67e 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,3 +1,4 @@ +- Fix : bug in launcher script status detector if data is in a mounted directory ### 26.0.0-2 (26-03-2023) - Minor bugs fixed - Fix : connection with desktop client https://github.com/alexbelgium/hassio-addons/issues/771 From b7224a5e7c146f64d5195efe06c422a71b795dd2 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 26 Mar 2023 16:01:11 +0200 Subject: [PATCH 6/6] Update 02-init_steps.sh --- .../rootfs/etc/cont-init.d/02-init_steps.sh | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh index f20a6a459..a91290c65 100755 --- a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh +++ b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh @@ -51,25 +51,25 @@ if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/ne bashio::log.green " " touch /notinstalled exit 0 -elif [[ $($LAUNCHER -V 2>&1) == *"Nextcloud"* ]]; then - # Log - bashio::log.green "--------------------------------------" - bashio::log.green "Nextcloud $CURRENTVERSION is installed" - bashio::log.green "--------------------------------------" # Is there an error elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]]; then bashio::log.red "--------------------------------------------------------" bashio::log.red "Issue in installation detected, Nextcloud will reinstall" bashio::log.red "--------------------------------------------------------" touch /reinstall -#else -# bashio::log.red "------------------------------------------------------------------" -# bashio::log.red "Unknown error detected, please create issue in github or reinstall" -# bashio::log.red "------------------------------------------------------------------" -# bashio::log.red "Error message:" -# bashio::log.red "$($LAUNCHER -V 2>&1)" -# bashio::log.red "------------------------------------------------------------------" -# bashio::exit.nok +elif [[ $($LAUNCHER -V 2>&1) == *"Nextcloud"* ]] || grep -q "/mnt/" /data/config/www/nextcloud/config/config.php &>/dev/null; then + # Log + bashio::log.green "--------------------------------------" + bashio::log.green "Nextcloud $CURRENTVERSION is installed" + bashio::log.green "--------------------------------------" +elif ! grep -q "/mnt/" /data/config/www/nextcloud/config/config.php; then + bashio::log.red "------------------------------------------------------------------" + bashio::log.red "Unknown error detected, please create issue in github or reinstall" + bashio::log.red "------------------------------------------------------------------" + bashio::log.red "Error message:" + bashio::log.red "$($LAUNCHER -V 2>&1)" + bashio::log.red "------------------------------------------------------------------" + bashio::exit.nok fi #########################