aboutsummaryrefslogtreecommitdiff
path: root/docs/installation
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-29 09:49:38 +0000
committerrinpatch <rinpatch@sdf.org>2019-06-29 09:49:38 +0000
commite9426d15d8e86a5445b5da4dda76128e605c5912 (patch)
treeda7fd9c7577fdeebdaf253e9b4002eacbe2c05f5 /docs/installation
parent456668b490e9ee47cf773a8563a9f3a3765ce348 (diff)
parent54d287377054fa48c5a14cf6b056cd80e838b264 (diff)
downloadpleroma-e9426d15d8e86a5445b5da4dda76128e605c5912.tar.gz
Merge branch 'rebase/docs-master' into 'master'
Cherry-pick documentation fixes to master See merge request pleroma/pleroma!1354
Diffstat (limited to 'docs/installation')
-rw-r--r--docs/installation/migrating_from_source_otp_en.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/installation/migrating_from_source_otp_en.md b/docs/installation/migrating_from_source_otp_en.md
index 0b41d0c0e..b779be8cc 100644
--- a/docs/installation/migrating_from_source_otp_en.md
+++ b/docs/installation/migrating_from_source_otp_en.md
@@ -49,7 +49,7 @@ mkdir -p /var/lib/pleroma/static
chown -R pleroma /var/lib/pleroma
# If you use the local uploader with default settings your uploads should be located in `~pleroma/uploads`
-mv ~pleroma/uploads /var/lib/pleroma/uploads
+mv ~pleroma/uploads/* /var/lib/pleroma/uploads
# If you have created the custom public files directory with default settings it should be located in `~pleroma/instance/static`
mv ~pleroma/instance/static /var/lib/pleroma/static
@@ -122,13 +122,15 @@ su pleroma -s $SHELL -lc "./bin/pleroma stop"
## Setting up a system service
OTP releases have different service files than from-source installs so they need to be copied over again.
+**Warning:** The service files assume pleroma user's home directory is `/opt/pleroma`, please make sure all paths fit your installation.
+
Debian/Ubuntu:
```sh
# Copy the service into a proper directory
cp ~pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
# Reload service files
-systemctl reload-daemon
+systemctl daemon-reload
# Reenable pleroma to start on boot
systemctl reenable pleroma