diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-12 12:07:07 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-12 12:07:07 +0300 |
| commit | bd40880fa0ed328c2948bb145354a8292fe051b5 (patch) | |
| tree | d997a20a129cd72fe24c1f7169e1f6952339ce02 /docs/installation | |
| parent | 5b696a8ac1b5a06e60c2143cf88e014b28e14702 (diff) | |
| parent | 00d17520314e3591caaa7ab4ca39c6227a6bdf15 (diff) | |
| download | pleroma-bd40880fa0ed328c2948bb145354a8292fe051b5.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
Diffstat (limited to 'docs/installation')
| -rw-r--r-- | docs/installation/otp_en.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md index 32551f7b6..fb99af699 100644 --- a/docs/installation/otp_en.md +++ b/docs/installation/otp_en.md @@ -156,8 +156,8 @@ cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/conf.d/pleroma.conf ``` ```sh tab="Debian/Ubuntu" -cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.nginx -ln -s /etc/nginx/sites-available/pleroma.nginx /etc/nginx/sites-enabled/pleroma.nginx +cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.conf +ln -s /etc/nginx/sites-available/pleroma.conf /etc/nginx/sites-enabled/pleroma.conf ``` If your distro does not have either of those you can append `include /etc/nginx/pleroma.conf` to the end of the http section in /etc/nginx/nginx.conf and |