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

docs: Avoid hardcoded /tmp paths in miscellaneous documentation.

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2019-01-14 17:56:06 -08:00
committed by Tim Abbott
parent b7179f8f79
commit 25d6107a4f
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/production/install-existing-server.md
View File

@@ -27,16 +27,16 @@ one created by Zulip into it:
```shell
sudo cp /etc/nginx/nginx.conf /etc/nginx.conf.before-zulip-install
wget -O /tmp/nginx.conf.zulip \
sudo wget -O /etc/nginx/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
sudo meld /etc/nginx/nginx.conf /etc/nginx/nginx.conf.zulip # be sure to merge to the right
```
After the zulip installation completes, then you can overwrite (or
merge) your new nginx.conf with the installed one:
```shell
$ sudo meld /tmp/nginx.conf.zulip /etc/nginx/nginx.conf # be sure to merge to the right
$ sudo meld /etc/nginx/nginx.conf.zulip /etc/nginx/nginx.conf # be sure to merge to the right
$ sudo service nginx restart
```