summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlibek Omarov <a1ba.omarov@gmail.com>2022-02-22 03:44:43 +0300
committerAlibek Omarov <a1ba.omarov@gmail.com>2022-02-22 04:02:45 +0300
commitd1ff7bfa318b26761b3527f594e128423de3ae2b (patch)
tree7cad6605fa550cdd54cc600dbcba4f8490035ee3
parenta90b5d6f79c3b45c320553c1619f2cde9a01bf25 (diff)
docs: change all mentions of pleroma.service to pleroma@.service, and specify template argument as prod
-rw-r--r--docs/administration/backup.md4
-rw-r--r--docs/configuration/hardening.md2
-rw-r--r--docs/configuration/onion_federation.md2
-rw-r--r--docs/installation/arch_linux_en.md6
-rw-r--r--docs/installation/debian_based_en.md6
-rw-r--r--docs/installation/debian_based_jp.md6
-rw-r--r--docs/installation/migrating_from_source_otp_en.md6
-rw-r--r--docs/installation/otp_en.md6
8 files changed, 19 insertions, 19 deletions
diff --git a/docs/administration/backup.md b/docs/administration/backup.md
index 5f279ab97..957472519 100644
--- a/docs/administration/backup.md
+++ b/docs/administration/backup.md
@@ -32,8 +32,8 @@
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`
+2. Stop the Pleroma service `systemctl stop pleroma@prod`
+3. Disable pleroma from systemd `systemctl disable pleroma@prod`
4. Remove the files and folders you created during installation (see installation guide). This includes the pleroma, 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 <pleroma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <pleroma_db>;'`
diff --git a/docs/configuration/hardening.md b/docs/configuration/hardening.md
index d3bfc4e4a..7687f6a41 100644
--- a/docs/configuration/hardening.md
+++ b/docs/configuration/hardening.md
@@ -64,7 +64,7 @@ If you click on a link, your browser’s request to the other site will include
## systemd
-A systemd unit example is provided at `installation/pleroma.service`.
+A systemd unit example is provided at `installation/pleroma@.service`.
### PrivateTmp
diff --git a/docs/configuration/onion_federation.md b/docs/configuration/onion_federation.md
index 37673211a..d35014e72 100644
--- a/docs/configuration/onion_federation.md
+++ b/docs/configuration/onion_federation.md
@@ -56,7 +56,7 @@ exit
```
restart Pleroma (if using systemd):
```
-systemctl restart pleroma
+systemctl restart pleroma@prod
```
# Tor Instance Access
diff --git a/docs/installation/arch_linux_en.md b/docs/installation/arch_linux_en.md
index 285743d56..7337158cc 100644
--- a/docs/installation/arch_linux_en.md
+++ b/docs/installation/arch_linux_en.md
@@ -194,14 +194,14 @@ You can find example configurations for them in `/opt/pleroma/installation/`.
* Copy example service file
```shell
-sudo cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+sudo cp /opt/pleroma/installation/pleroma@.service /etc/systemd/system/pleroma@.service
```
* Edit the service file and make sure that all paths fit your installation
-* Enable and start `pleroma.service`:
+* Enable and start `pleroma@prod.service`:
```shell
-sudo systemctl enable --now pleroma.service
+sudo systemctl enable --now pleroma@prod.service
```
#### Create your first user
diff --git a/docs/installation/debian_based_en.md b/docs/installation/debian_based_en.md
index 4e52b2155..271fc8891 100644
--- a/docs/installation/debian_based_en.md
+++ b/docs/installation/debian_based_en.md
@@ -157,14 +157,14 @@ You can find example configurations for them in `/opt/pleroma/installation/`.
* Copy example service file
```shell
-sudo cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+sudo cp /opt/pleroma/installation/pleroma@.service /etc/systemd/system/pleroma@.service
```
* Edit the service file and make sure that all paths fit your installation
-* Enable and start `pleroma.service`:
+* Enable and start `pleroma@prod.service`:
```shell
-sudo systemctl enable --now pleroma.service
+sudo systemctl enable --now pleroma@prod.service
```
#### Create your first user
diff --git a/docs/installation/debian_based_jp.md b/docs/installation/debian_based_jp.md
index 3736e857f..6ddb988bd 100644
--- a/docs/installation/debian_based_jp.md
+++ b/docs/installation/debian_based_jp.md
@@ -166,13 +166,13 @@ sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --webroot -w /
* サービスファイルのサンプルをコピーします。
```
-sudo cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+sudo cp /opt/pleroma/installation/pleroma@.service /etc/systemd/system/pleroma@.service
```
* サービスファイルを変更します。すべてのパスが正しいことを確認してください
-* サービスを有効化し `pleroma.service` を開始してください
+* サービスを有効化し `pleroma@prod.service` を開始してください
```
-sudo systemctl enable --now pleroma.service
+sudo systemctl enable --now pleroma@prod.service
```
#### 初期ユーザの作成
diff --git a/docs/installation/migrating_from_source_otp_en.md b/docs/installation/migrating_from_source_otp_en.md
index e4a01d8db..8b08a0dc0 100644
--- a/docs/installation/migrating_from_source_otp_en.md
+++ b/docs/installation/migrating_from_source_otp_en.md
@@ -125,16 +125,16 @@ OTP releases have different service files than from-source installs so they need
=== "Debian/Ubuntu"
```sh
# Copy the service into a proper directory
- cp ~pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+ cp ~pleroma/installation/pleroma@.service /etc/systemd/system/pleroma@.service
# Reload service files
systemctl daemon-reload
# Reenable pleroma to start on boot
- systemctl reenable pleroma
+ systemctl reenable pleroma@prod
# Start pleroma
- systemctl start pleroma
+ systemctl start pleroma@prod
```
## Running mix tasks
diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md
index 0861a8157..ee9fa16fa 100644
--- a/docs/installation/otp_en.md
+++ b/docs/installation/otp_en.md
@@ -226,11 +226,11 @@ At this point if you open your (sub)domain in a browser you should see a 502 err
=== "Debian/Ubuntu"
```
# Copy the service into a proper directory
- cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+ cp /opt/pleroma/installation/pleroma@.service /etc/systemd/system/pleroma@.service
# Start pleroma and enable it on boot
- systemctl start pleroma
- systemctl enable pleroma
+ systemctl start pleroma@prod
+ systemctl enable pleroma@prod
```
If everything worked, you should see Pleroma-FE when visiting your domain. If that didn't happen, try reviewing the installation steps, starting Pleroma in the foreground and seeing if there are any errrors.