From 1528f50a40bd0f910b4ccb3c7c86f64d14eb5b35 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 16:07:58 +0700 Subject: [PATCH 01/14] Test --- scripts/upgrade | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d3027c7..03b160c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,6 +128,19 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." + +if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 +then + ynh_script_progression --message="Moving old Filesystem to secure MinIO start" + old = "OLD" + mv "$datadir" "$datadir$old" + mkdir "$datadir" +fi + #================================================= # START SYSTEMD SERVICE #================================================= @@ -159,7 +172,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" - pushd $datadir + pushd $datadir$old for d in * ; do if [ "$d" == "*" ] then @@ -169,7 +182,7 @@ then mv "$d" "DATA_$d" pushd $mc_path ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" - ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir/DATA_$d" minio/"$d" + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir$old/DATA_$d" minio/"$d" # This is a hack, but it will make outline_ynh users' lifes much easier ! if [ "$d" == "outlinestorage" ] then @@ -182,6 +195,7 @@ then fi done popd + ynh_secure_remove --file="$datadir$old" else ynh_script_progression --message="No migration required" fi From 88b4b4da2a882ebbec8a233078baa288939ff56c Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 17:48:31 +0700 Subject: [PATCH 02/14] Update upgrade --- scripts/upgrade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 03b160c..e593d35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,8 +136,8 @@ ynh_script_progression --message="Ensuring downward compatibility..." if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" - old = "OLD" - mv "$datadir" "$datadir$old" + tmp = "/tmp/minio" + mv "$datadir" "$tmp" mkdir "$datadir" fi @@ -172,7 +172,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" - pushd $datadir$old + pushd $tmp for d in * ; do if [ "$d" == "*" ] then @@ -182,7 +182,7 @@ then mv "$d" "DATA_$d" pushd $mc_path ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" - ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir$old/DATA_$d" minio/"$d" + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$tmp/DATA_$d" minio/"$d" # This is a hack, but it will make outline_ynh users' lifes much easier ! if [ "$d" == "outlinestorage" ] then @@ -195,7 +195,7 @@ then fi done popd - ynh_secure_remove --file="$datadir$old" + ynh_secure_remove --file="$tmp" else ynh_script_progression --message="No migration required" fi From afbffde4bd45e019c2179de01c679d970c4c4609 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 18:13:25 +0700 Subject: [PATCH 03/14] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e593d35..0d6c92a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,7 +136,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" - tmp = "/tmp/minio" + tmp="/tmp/minio" mv "$datadir" "$tmp" mkdir "$datadir" fi From 6e268754fc105430e99ee68de754c94cfae9a3d4 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 18:58:22 +0700 Subject: [PATCH 04/14] Update upgrade --- scripts/upgrade | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0d6c92a..c247b06 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,17 +172,16 @@ ynh_script_progression --message="Ensuring downward compatibility..." if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" - pushd $tmp + pushd "$tmp" for d in * ; do if [ "$d" == "*" ] then ynh_script_progression --message="No buckets to migrate" else ynh_script_progression --message="Migrating bucket $d" - mv "$d" "DATA_$d" pushd $mc_path ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" - ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$tmp/DATA_$d" minio/"$d" + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$tmp/$d" "minio/$d" # This is a hack, but it will make outline_ynh users' lifes much easier ! if [ "$d" == "outlinestorage" ] then From 99edee543f0324fe2d4f5934762d8353ce65a82f Mon Sep 17 00:00:00 2001 From: Limezy Date: Sun, 29 Jan 2023 19:29:05 +0700 Subject: [PATCH 05/14] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c247b06..10df4cb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" - pushd "$tmp" + pushd "$tmp/" for d in * ; do if [ "$d" == "*" ] then From 170f6c22c4d1b5290cffbcf65e15ab2b7a428597 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 12:18:47 +0700 Subject: [PATCH 06/14] Update upgrade --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 10df4cb..648fceb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -139,6 +139,9 @@ then tmp="/tmp/minio" mv "$datadir" "$tmp" mkdir "$datadir" + chmod 750 "$datadir" + chmod -R o-rwx "$datadir" + chown -R $app:www-data "$datadir" fi #================================================= From b08cfc11c0419bb580babdcc82a066902c11dfd3 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 21:09:35 +0700 Subject: [PATCH 07/14] Update mc --- conf/mc_amd64.src | 4 ++-- conf/mc_arm64.src | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/mc_amd64.src b/conf/mc_amd64.src index 904ef69..a32de2d 100644 --- a/conf/mc_amd64.src +++ b/conf/mc_amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-12-24T15-21-38Z -SOURCE_SUM=8274f56d3ca69b2538fd818ff53a793c2fe1fc568489d97ee74d463123536aa6 +SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2023-01-28T20-29-38Z +SOURCE_SUM=ecd7b92a7a5c6e74db16fcd19950a28fa8ccb1fcc343ff37050787da346f7d4e SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc diff --git a/conf/mc_arm64.src b/conf/mc_arm64.src index ac46f4e..610837a 100644 --- a/conf/mc_arm64.src +++ b/conf/mc_arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-12-24T15-21-38Z -SOURCE_SUM=5a29fb81e9a7d75b0afca9fbccfca6eba6c54e7dcefbe8b0ac662bc7a70e089a +SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2023-01-28T20-29-38Z +SOURCE_SUM=319fb47eb7f48e3e6efff1151bb82d44463d5c23f94495146c813f9ed2531a4b SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc From 28bc325e86569b88f39bf02598abadfe34e78fdb Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 21:57:32 +0700 Subject: [PATCH 08/14] Change from .mc policy to .mc anonymous --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 648fceb..19b5909 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -188,7 +188,7 @@ then # This is a hack, but it will make outline_ynh users' lifes much easier ! if [ "$d" == "outlinestorage" ] then - ynh_exec_warn_less sudo -u $app ./mc policy set public minio/outlinestorage + ynh_exec_warn_less sudo -u $app ./mc anonymous set public minio/outlinestorage else ynh_script_progression --message="Bucket is migrated and objects are now mirrored. However, make sure to set properly access policy of bucket $d. That part of the migration can't be automated, sorry ! You can log into the minio console to perform your changes." fi From 2d2ed47ca5d88517461fb421c4696e367161dd88 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 23:19:17 +0700 Subject: [PATCH 09/14] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 19b5909..773eede 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,7 +137,7 @@ if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" tmp="/tmp/minio" - mv "$datadir" "$tmp" + mv "$datadir/*" "$tmp" mkdir "$datadir" chmod 750 "$datadir" chmod -R o-rwx "$datadir" From ca1a3424ec1c6eb059a4b9daff59d32695f4c6ec Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 23:27:45 +0700 Subject: [PATCH 10/14] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 773eede..0c71a45 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,7 +137,7 @@ if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" tmp="/tmp/minio" - mv "$datadir/*" "$tmp" + mv "$datadir/" "$tmp" mkdir "$datadir" chmod 750 "$datadir" chmod -R o-rwx "$datadir" From c526e098116cdad722ad21af01d92a99f58568a1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 23:36:56 +0700 Subject: [PATCH 11/14] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0c71a45..0fbd3f6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,8 +137,8 @@ if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" tmp="/tmp/minio" - mv "$datadir/" "$tmp" - mkdir "$datadir" + ynh_exec_warn_less cp -Ra "$datadir/*" "$tmp" + ynh_exec_warn_less mkdir "$datadir" chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" From b60cb969acef65bccc3e4f6264df33480e74b8a1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 23:47:12 +0700 Subject: [PATCH 12/14] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0fbd3f6..b08775d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,7 +137,7 @@ if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" tmp="/tmp/minio" - ynh_exec_warn_less cp -Ra "$datadir/*" "$tmp" + ynh_exec_warn_less cp -Ra "$datadir/" "$tmp" ynh_exec_warn_less mkdir "$datadir" chmod 750 "$datadir" chmod -R o-rwx "$datadir" From c69524771cbe5f64c356565cf8649ffcf2202ebb Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 1 Feb 2023 23:52:44 +0700 Subject: [PATCH 13/14] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index b08775d..f08ab3d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,6 +138,7 @@ then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" tmp="/tmp/minio" ynh_exec_warn_less cp -Ra "$datadir/" "$tmp" + ynh_secure_remove --file="$datadir" ynh_exec_warn_less mkdir "$datadir" chmod 750 "$datadir" chmod -R o-rwx "$datadir" From 541fb67a83b9226711996cee84a8aec73fbee9a0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 2 Feb 2023 00:04:06 +0700 Subject: [PATCH 14/14] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f08ab3d..a187156 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,7 +137,7 @@ if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Moving old Filesystem to secure MinIO start" tmp="/tmp/minio" - ynh_exec_warn_less cp -Ra "$datadir/" "$tmp" + ynh_exec_warn_less cp -Ra "$datadir" "$tmp" ynh_secure_remove --file="$datadir" ynh_exec_warn_less mkdir "$datadir" chmod 750 "$datadir"