Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Support nginx_listen_port with http_only

This commit is contained in:
Casper Kvan Clausen 2020-07-31 19:00:45 -05:00 committed by Alex Vandiver
parent 9504d403b3
commit ed7a6d5e4d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/zulip/manifests/app_frontend.pp
View File

@ -5,7 +5,11 @@ class zulip::app_frontend {
include zulip::app_frontend_once include zulip::app_frontend_once
$nginx_http_only = zulipconf('application_server', 'http_only', undef) $nginx_http_only = zulipconf('application_server', 'http_only', undef)
if $nginx_http_only != '' {
$nginx_listen_port = zulipconf('application_server', 'nginx_listen_port', 80)
} else {
$nginx_listen_port = zulipconf('application_server', 'nginx_listen_port', 443) $nginx_listen_port = zulipconf('application_server', 'nginx_listen_port', 443)
}
$no_serve_uploads = zulipconf('application_server', 'no_serve_uploads', undef) $no_serve_uploads = zulipconf('application_server', 'no_serve_uploads', undef)
$ssl_dir = $::osfamily ? { $ssl_dir = $::osfamily ? {
'debian' => '/etc/ssl', 'debian' => '/etc/ssl',

4
puppet/zulip/templates/nginx/zulip-enterprise.template.erb
View File

@ -16,8 +16,8 @@ include /etc/nginx/zulip-include/upstreams;
server { server {
<% if @nginx_http_only != '' -%> <% if @nginx_http_only != '' -%>
listen 80; listen <%= @nginx_listen_port %>;
listen [::]:80; listen [::]:<%= @nginx_listen_port %>;
<% else -%> <% else -%>
listen <%= @nginx_listen_port %> http2; listen <%= @nginx_listen_port %> http2;
listen [::]:<%= @nginx_listen_port %> http2; listen [::]:<%= @nginx_listen_port %> http2;