mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 13:33:24 +00:00
docs: Update path to nginx.conf, as it is now a template.
Also provide the right expansion for the one embedded variable currently in the template.
This commit is contained in:
committed by
Tim Abbott
parent
6e59d08a74
commit
663d3b780d
@@ -29,10 +29,17 @@ one created by Zulip into it:
|
|||||||
```shell
|
```shell
|
||||||
sudo cp /etc/nginx/nginx.conf /etc/nginx.conf.before-zulip-install
|
sudo cp /etc/nginx/nginx.conf /etc/nginx.conf.before-zulip-install
|
||||||
sudo wget -O /etc/nginx/nginx.conf.zulip \
|
sudo wget -O /etc/nginx/nginx.conf.zulip \
|
||||||
https://raw.githubusercontent.com/zulip/zulip/master/puppet/zulip/files/nginx/nginx.conf
|
https://raw.githubusercontent.com/zulip/zulip/master/puppet/zulip/templates/nginx.conf.template.erb
|
||||||
sudo meld /etc/nginx/nginx.conf /etc/nginx/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
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Since the file in Zulip is an [ERB Puppet
|
||||||
|
template](https://puppet.com/docs/puppet/7/lang_template_erb.html),
|
||||||
|
you will also need to replace any `<%= ... %>` sections with
|
||||||
|
appropriate content. For instance `<%= @ca_crt %>` should be replaced
|
||||||
|
with `/etc/ssl/certs/ca-certificates.crt` on Debian and Ubuntu
|
||||||
|
installs.
|
||||||
|
|
||||||
After the Zulip installation completes, then you can overwrite (or
|
After the Zulip installation completes, then you can overwrite (or
|
||||||
merge) your new nginx.conf with the installed one:
|
merge) your new nginx.conf with the installed one:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user