Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ai3
float
Commits
b46744a8
Commit
b46744a8
authored
Mar 25, 2020
by
ale
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nginx-port' into 'master'
Allow running NGINX on a different (local) port See merge request
!99
parents
953ceed5
c120a18c
Pipeline
#6195
failed with stages
in 2 minutes and 23 seconds
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
roles/nginx/defaults/main.yml
roles/nginx/defaults/main.yml
+5
-0
roles/nginx/templates/config/sites-available/default
roles/nginx/templates/config/sites-available/default
+2
-2
roles/nginx/templates/nginx-vhost.j2
roles/nginx/templates/nginx-vhost.j2
+1
-1
No files found.
roles/nginx/defaults/main.yml
View file @
b46744a8
---
dhparam_bits
:
2048
# Ports that NGINX should bind to. Only change if you are setting
# up transparent proxies or other network-level trickery on frontends.
nginx_http_port
:
80
nginx_https_port
:
443
# How much memory to use for key caching in the proxy_cache.
nginx_cache_keys_mem
:
"
64m"
...
...
roles/nginx/templates/config/sites-available/default
View file @
b46744a8
...
...
@@ -9,7 +9,7 @@ map $http_host $top_level_domain_redirect {
}
server {
listen [::]:
80
default_server ipv6only=off;
listen [::]:
{{ nginx_http_port }}
default_server ipv6only=off;
server_name _;
{# Only enable this if the 'acme' service is defined,
...
...
@@ -33,7 +33,7 @@ server {
}
server {
listen [::]:
443
http2 default_server ipv6only=off;
listen [::]:
{{ nginx_https_port }}
http2 default_server ipv6only=off;
server_name _;
ssl on;
...
...
roles/nginx/templates/nginx-vhost.j2
View file @
b46744a8
...
...
@@ -23,7 +23,7 @@
{% macro config_vhost(endpoint, shard=None) %}
server {
listen [::]:
443
http2;
listen [::]:
{{ nginx_https_port }}
http2;
{% if endpoint.domains %}
server_name {{ endpoint.domains | join(' ') }};
{% else %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment