From 0e344ac8bb64ad55a2534afeb224fd3cb49cbabd Mon Sep 17 00:00:00 2001 From: norm Date: Sun, 3 Jul 2022 15:18:43 +0000 Subject: [PATCH] Update administration docs (#39) Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/39 Co-authored-by: norm Co-committed-by: norm --- docs/administration/CLI_tasks/config.md | 2 +- docs/administration/CLI_tasks/frontend.md | 21 +++++----- .../CLI_tasks/general_cli_task_info.include | 4 +- docs/administration/backup.md | 40 +++++++++---------- docs/administration/updating.md | 14 +++---- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/docs/administration/CLI_tasks/config.md b/docs/administration/CLI_tasks/config.md index fc9f3cbd5..5a7ae2c7a 100644 --- a/docs/administration/CLI_tasks/config.md +++ b/docs/administration/CLI_tasks/config.md @@ -34,7 +34,7 @@ Options: -- `` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non standart folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/pleroma`. For installation from source - `config` directory in the pleroma folder. +- `` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non standart folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/akkoma`. For installation from source - `config` directory in the akkoma folder. - `` - environment, for which is migrated config. By default is `prod`. - To delete transferred settings from database optional flag `-d` can be used diff --git a/docs/administration/CLI_tasks/frontend.md b/docs/administration/CLI_tasks/frontend.md index d4a48cb56..1fadc921f 100644 --- a/docs/administration/CLI_tasks/frontend.md +++ b/docs/administration/CLI_tasks/frontend.md @@ -18,10 +18,9 @@ You can give all the options directly on the command line, but missing informati Currently, known `` values are: -- [admin-fe](https://git.pleroma.social/pleroma/admin-fe) -- [kenoma](http://git.pleroma.social/lambadalambda/kenoma) -- [pleroma-fe](http://git.pleroma.social/pleroma/pleroma-fe) -- [fedi-fe](https://git.pleroma.social/pleroma/fedi-fe) +- [admin-fe](https://akkoma.dev/AkkomaGang/admin-fe) +- [mastodon-fe](https://akkoma.dev/AkkomaGang/masto-fe) +- [pleroma-fe](https://akkoma.dev/AkkomaGang/pleroma-fe) - [soapbox-fe](https://gitlab.com/soapbox-pub/soapbox-fe) You can still install frontends that are not configured, see below. @@ -33,29 +32,29 @@ For a frontend configured under the `available` key, it's enough to install it b === "OTP" ```sh - ./bin/pleroma_ctl frontend install pleroma + ./bin/pleroma_ctl frontend install pleroma-fe ``` === "From Source" ```sh - mix pleroma.frontend install pleroma + mix pleroma.frontend install pleroma-fe ``` This will download the latest build for the pre-configured `ref` and install it. It can then be configured as the one of the served frontends in the config file (see `primary` or `admin`). -You can override any of the details. To install a pleroma build from a different URL, you could do this: +You can override any of the details. To install a Pleroma-FE build from a different URL, you could do this: === "OTP" ```sh - ./bin/pleroma_ctl frontend install pleroma --ref 2hu_edition --build-url https://example.org/raymoo.zip + ./bin/pleroma_ctl frontend install pleroma-fe --ref 2hu_edition --build-url https://example.org/raymoo.zip ``` === "From Source" ```sh - mix pleroma.frontend install pleroma --ref 2hu_edition --build-url https://example.org/raymoo.zip + mix pleroma.frontend install pleroma-fe --ref 2hu_edition --build-url https://example.org/raymoo.zip ``` Similarly, you can also install from a local zip file. @@ -63,13 +62,13 @@ Similarly, you can also install from a local zip file. === "OTP" ```sh - ./bin/pleroma_ctl frontend install pleroma --ref mybuild --file ~/Downloads/doomfe.zip + ./bin/pleroma_ctl frontend install pleroma-fe --ref mybuild --file ~/Downloads/doomfe.zip ``` === "From Source" ```sh - mix pleroma.frontend install pleroma --ref mybuild --file ~/Downloads/doomfe.zip + mix pleroma.frontend install pleroma-fe --ref mybuild --file ~/Downloads/doomfe.zip ``` The resulting frontend will always be installed into a folder of this template: `${instance_static}/frontends/${name}/${ref}`. diff --git a/docs/administration/CLI_tasks/general_cli_task_info.include b/docs/administration/CLI_tasks/general_cli_task_info.include index a1ff1da12..500e68e8d 100644 --- a/docs/administration/CLI_tasks/general_cli_task_info.include +++ b/docs/administration/CLI_tasks/general_cli_task_info.include @@ -1,5 +1,5 @@ -Every command should be ran as the `pleroma` user from it's home directory. For example if you are superuser, you would have to wrap the command in `su pleroma -s $SHELL -lc "$COMMAND"`. +Every command should be ran as the `akkoma` user from it's home directory. For example if you are superuser, you would have to wrap the command in `su akkoma -s $SHELL -lc "$COMMAND"`. ??? note "From source note about `MIX_ENV`" - The `mix` command should be prefixed with the name of environment your Pleroma server is running in, usually it's `MIX_ENV=prod` + The `mix` command should be prefixed with the name of environment your Akkoma server is running in, usually it's `MIX_ENV=prod` diff --git a/docs/administration/backup.md b/docs/administration/backup.md index 5f279ab97..ffc74e1ff 100644 --- a/docs/administration/backup.md +++ b/docs/administration/backup.md @@ -2,28 +2,28 @@ ## Backup -1. Stop the Pleroma service. -2. Go to the working directory of Pleroma (default is `/opt/pleroma`) -3. Run `sudo -Hu postgres pg_dump -d --format=custom -f ` (make sure the postgres user has write access to the destination file) -4. Copy `pleroma.pgdump`, `config/prod.secret.exs`, `config/setup_db.psql` (if still available) and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too. -5. Restart the Pleroma service. +1. Stop the Akkoma service. +2. Go to the working directory of Akkoma (default is `/opt/akkoma`) +3. Run `sudo -Hu postgres pg_dump -d --format=custom -f ` (make sure the postgres user has write access to the destination file) +4. Copy `akkoma.pgdump`, `config/prod.secret.exs`, `config/setup_db.psql` (if still available) and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too. +5. Restart the Akkoma service. ## Restore/Move -1. Optionally reinstall Pleroma (either on the same server or on another server if you want to move servers). -2. Stop the Pleroma service. -3. Go to the working directory of Pleroma (default is `/opt/pleroma`) +1. Optionally reinstall Akkoma (either on the same server or on another server if you want to move servers). +2. Stop the Akkoma service. +3. Go to the working directory of Akkoma (default is `/opt/akkoma`) 4. Copy the above mentioned files back to their original position. -5. Drop the existing database and user if restoring in-place. `sudo -Hu postgres psql -c 'DROP DATABASE ;';` `sudo -Hu postgres psql -c 'DROP USER ;'` -6. Restore the database schema and pleroma postgres role the with the original `setup_db.psql` if you have it: `sudo -Hu postgres psql -f config/setup_db.psql`. +5. Drop the existing database and user if restoring in-place. `sudo -Hu postgres psql -c 'DROP DATABASE ;';` `sudo -Hu postgres psql -c 'DROP USER ;'` +6. Restore the database schema and akkoma postgres role the with the original `setup_db.psql` if you have it: `sudo -Hu postgres psql -f config/setup_db.psql`. - Alternatively, run the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backup of `config/prod.secret.exs`. Then run the restoration of the pleroma role and schema with of the generated `config/setup_db.psql` as instructed above. You may delete the `config/generated_config.exs` file as it is not needed. + Alternatively, run the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backup of `config/prod.secret.exs`. Then run the restoration of the akkoma role and schema with of the generated `config/setup_db.psql` as instructed above. You may delete the `config/generated_config.exs` file as it is not needed. -7. Now restore the Pleroma instance's data into the empty database schema: `sudo -Hu postgres pg_restore -d -v -1 ` -8. If you installed a newer Pleroma version, you should run `mix ecto.migrate`[^1]. This task performs database migrations, if there were any. -9. Restart the Pleroma service. +7. Now restore the Akkoma instance's data into the empty database schema: `sudo -Hu postgres pg_restore -d -v -1 ` +8. If you installed a newer Akkoma version, you should run `mix ecto.migrate`[^1]. This task performs database migrations, if there were any. +9. Restart the Akkoma service. 10. Run `sudo -Hu postgres vacuumdb --all --analyze-in-stages`. This will quickly generate the statistics so that postgres can properly plan queries. -11. If setting up on a new server configure Nginx by using the `installation/pleroma.nginx` config sample or reference the Pleroma installation guide for your OS which contains the Nginx configuration instructions. +11. If setting up on a new server configure Nginx by using the `installation/akkoma.nginx` config sample or reference the Akkoma installation guide for your OS which contains the Nginx configuration instructions. [^1]: Prefix with `MIX_ENV=prod` to run it using the production config file. @@ -32,10 +32,10 @@ 1. Optionally you can remove the users of your instance. This will trigger delete requests for their accounts and posts. Note that this is 'best effort' and doesn't mean that all traces of your instance will be gone from the fediverse. * You can do this from the admin-FE where you can select all local users and delete the accounts using the *Moderate multiple users* dropdown. * You can also list local users and delete them individualy using the CLI tasks for [Managing users](./CLI_tasks/user.md). -2. Stop the Pleroma service `systemctl stop pleroma` -3. Disable pleroma from systemd `systemctl disable pleroma` -4. Remove the files and folders you created during installation (see installation guide). This includes the pleroma, nginx and systemd files and folders. +2. Stop the Akkoma service `systemctl stop akkoma` +3. Disable akkoma from systemd `systemctl disable akkoma` +4. Remove the files and folders you created during installation (see installation guide). This includes the akkoma, nginx and systemd files and folders. 5. Reload nginx now that the configuration is removed `systemctl reload nginx` -6. Remove the database and database user `sudo -Hu postgres psql -c 'DROP DATABASE ;';` `sudo -Hu postgres psql -c 'DROP USER ;'` -7. Remove the system user `userdel pleroma` +6. Remove the database and database user `sudo -Hu postgres psql -c 'DROP DATABASE ;';` `sudo -Hu postgres psql -c 'DROP USER ;'` +7. Remove the system user `userdel akkoma` 8. Remove the dependencies that you don't need anymore (see installation guide). Make sure you don't remove packages that are still needed for other software that you have running! diff --git a/docs/administration/updating.md b/docs/administration/updating.md index 01d3b9b0e..d7d30c926 100644 --- a/docs/administration/updating.md +++ b/docs/administration/updating.md @@ -1,6 +1,6 @@ # Updating your instance -You should **always check the [release notes/changelog](https://git.pleroma.social/pleroma/pleroma/-/releases)** in case there are config deprecations, special update steps, etc. +You should **always check the [release notes/changelog](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/CHANGELOG.md)** in case there are config deprecations, special update steps, etc. Besides that, doing the following is generally enough: @@ -8,20 +8,20 @@ Besides that, doing the following is generally enough: ```sh # Download the new release -su pleroma -s $SHELL -lc "./bin/pleroma_ctl update" +su akkoma -s $SHELL -lc "./bin/pleroma_ctl update" # Migrate the database, you are advised to stop the instance before doing that -su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate" +su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate" ``` ## For from source installations (using git) -1. Go to the working directory of Pleroma (default is `/opt/pleroma`) +1. Go to the working directory of Akkoma (default is `/opt/akkoma`) 2. Run `git pull` [^1]. This pulls the latest changes from upstream. 3. Run `mix deps.get` [^1]. This pulls in any new dependencies. -4. Stop the Pleroma service. +4. Stop the Akkoma service. 5. Run `mix ecto.migrate` [^1] [^2]. This task performs database migrations, if there were any. -6. Start the Pleroma service. +6. Start the Akkoma service. -[^1]: Depending on which install guide you followed (for example on Debian/Ubuntu), you want to run `git` and `mix` tasks as `pleroma` user by adding `sudo -Hu pleroma` before the command. +[^1]: Depending on which install guide you followed (for example on Debian/Ubuntu), you want to run `git` and `mix` tasks as `akkoma` user by adding `sudo -Hu akkoma` before the command. [^2]: Prefix with `MIX_ENV=prod` to run it using the production config file. -- 2.45.2