paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: Fix problematic line-wrapping.

Browse Source
This commit is contained in:
Tim Abbott
2017-08-23 15:10:35 -07:00
parent 2424819749
commit a397e92fb3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/prod-install-existing-server.md
View File

@@ -22,9 +22,10 @@ Copy your existing nginx configuration to a backup and then merge the
one created by Zulip into it:
```shell
$ sudo cp /etc/nginx/nginx.conf /etc/nginx.conf.before-zulip-install
$ wget https://raw.githubusercontent.com/zulip/zulip/master/puppet/zulip/files/nginx/nginx.conf -O /tmp/nginx.conf.zulip
$ sudo meld /etc/nginx/nginx.conf /tmp/nginx.conf.zulip # be sure to merge to the right
sudo cp /etc/nginx/nginx.conf /etc/nginx.conf.before-zulip-install
wget -O /tmp/nginx.conf.zulip \
https://raw.githubusercontent.com/zulip/zulip/master/puppet/zulip/files/nginx/nginx.conf
sudo meld /etc/nginx/nginx.conf /tmp/nginx.conf.zulip # be sure to merge to the right
```
After the zulip installation completes, then you can overwrite (or