X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=docs%2Fdocs%2Finstallation%2Fmigrating_to_akkoma.md;h=3947914ab1ee6ca9106f212bc2208c0083b64b04;hb=2c8f57db989050507bfd1f1a5ccb6c02c6418595;hp=181f6dae639ac52c5fdeb7887089902ab2321d41;hpb=d2a185c01385ef53c712c8d315c69d5deb044e2f;p=akkoma diff --git a/docs/docs/installation/migrating_to_akkoma.md b/docs/docs/installation/migrating_to_akkoma.md index 181f6dae6..3947914ab 100644 --- a/docs/docs/installation/migrating_to_akkoma.md +++ b/docs/docs/installation/migrating_to_akkoma.md @@ -30,22 +30,18 @@ upstream git URL then just rebuild - that'll be: git remote set-url origin https://akkoma.dev/AkkomaGang/akkoma.git/ git fetch origin git pull -r +# or, if you're on an instance-specific branch, you may want +# to run "git merge stable" instead (or develop if you want) ``` Then compile, migrate and restart as usual. ## From OTP -**IMPORTANT: if you are using musl1.1 (void linux musl edition), -you will need to override the FLAVOUR to amd64-musl11, -also pls go shout at your maintainers to actually upgrade from EOL software.** - -the flavour to be - -This will just be setting the update URL - +This will just be setting the update URL - find your flavour from the [mapping on the install guide](../otp_en/#detecting-flavour) first. ```bash -export FLAVOUR=$(arch="$(uname -m)";if [ "$arch" = "x86_64" ];then arch="amd64";elif [ "$arch" = "armv7l" ];then arch="arm";elif [ "$arch" = "aarch64" ];then arch="arm64";else echo "Unsupported arch: $arch">&2;fi;if getconf GNU_LIBC_VERSION>/dev/null;then libc_postfix="";elif [ "$(ldd 2>&1|head -c 9)" = "musl libc" ];then libc_postfix="-musl";elif [ "$(find /lib/libc.musl*|wc -l)" ];then libc_postfix="-musl";else echo "Unsupported libc">&2;fi;echo "$arch$libc_postfix") +export FLAVOUR=[the flavour you found above] ./bin/pleroma_ctl update --zip-url https://akkoma-updates.s3-website.fr-par.scw.cloud/develop/akkoma-$FLAVOUR.zip ./bin/pleroma_ctl migrate