Merge branch 'develop' into release-docs

[akkoma] / docs / installation / releases_en.md

diff --git a/docs/installation/releases_en.md b/docs/installation/releases_en.md
index 48fffa6e27d328954b99899ec30859afc81db67d..ce46d0d29fd44832207488889cbfc6e122499cfc 100644 (file)
--- a/docs/installation/releases_en.md
+++ b/docs/installation/releases_en.md
@@ -12,10 +12,10 @@ While in theory OTP releases are possbile to install on any compatible machine,
 
 Paste the following into the shell:
 ```sh
-arch="$(arch)";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;exit 1;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;exit 1;fi;echo "$arch$libc_postfix"
+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"
 ```
 
-If your platform is supported the output will contain the flavour string, you will need it later. If not, this just means that we don't build releases for your platform, you can still try the regular install.
+If your platform is supported the output will contain the flavour string, you will need it later. If not, this just means that we don't build releases for your platform, you can still try installing from source.
 
 ### Installing the required packages
 
@@ -33,7 +33,9 @@ apt install curl unzip libncurses5 postgresql postgresql-contrib nginx certbot
 ```
 Alpine:
 ```sh
-apk add curl unzip ncurses postgresql posqtgresql-contrib nginx certbot
+echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories
+apk update
+apk add curl unzip ncurses postgresql postgresql-contrib nginx certbot
 ```
 
 ## Setup
@@ -47,12 +49,11 @@ apt install postgresql-11-rum
 ```
 Alpine:
 ```sh
-apk install gcc make
+apk add gcc make git postgresql-dev musl-dev
 git clone https://github.com/postgrespro/rum /tmp/rum
 cd /tmp/rum
 make USE_PGXS=1
 make USE_PGXS=1 install
-make USE_PGXS=1 installcheck
 cd
 rm -r /tmp/rum
 ```
@@ -107,27 +108,26 @@ chown -R pleroma /etc/pleroma
 su pleroma -s $SHELL -lc "./bin/pleroma_ctl instance gen --output /etc/pleroma/config.exs --output-psql /tmp/setup_db.psql"
 
 # Create the postgres database
-psql -U postgres -d postgres -f /tmp/setup_db.psql
+su postgres -s $SHELL -lc "psql -f /tmp/setup_db.psql"
 
 # If you have installed RUM indexes add
 # `config :pleroma, :database, rum_enabled: true`
 # to the end of /etc/pleroma/config.exs before proceeding
 
 # Create the database schema
-./bin/pleroma_ctl create
-./bin/pleroma_ctl migrate
+su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate"
 
-# If you have installed RUM indexes also run
-# ./bin/pleroma_ctl migrate --migrations-path priv/repo/optional_migrations/rum_indexing/
+# If you have installed RUM indexes uncommend and run
+# su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate --migrations-path priv/repo/optional_migrations/rum_indexing/"
 
 # Start the instance to verify that everything is working as expected
-./bin/pleroma daemon
+su pleroma -s $SHELL -lc "./bin/pleroma daemon"
 
 # Wait for about 20 seconds and query the instance endpoint, if it shows your uri, name and email correctly, you are configured correctly
 sleep 20 && curl http://localhost:4000/api/v1/instance
 
 # Stop the instance
-./bin/pleroma stop
+su pleroma -s $SHELL -lc "./bin/pleroma stop"
 ```
 
 ### Setting up nginx and getting Let's Encrypt SSL certificaties