Skip to content

Fixes for missing hostnames and jenkins #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pearj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for missing hostnames and jenkins #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions scripts/templates/proxy.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{%- if swarm_mode %}
resolver {{ dns_servers }} valid=5m;

{%- else %}
{%- if not swarm_mode %}
{%- for service_name, service in services.iteritems() %}
upstream {{ service_name|lower }} {
{%- if service.balancing_type %}
Expand All @@ -17,12 +14,16 @@ upstream {{ service_name|lower }} {
server {
listen 80 default_server;
server_name _;
ignore_invalid_headers off;
return 404;
}

{%- for hostname, host in hosts.iteritems() %}
{%- if host['protocols']['http'] %}
server {
{%- if swarm_mode %}
resolver {{ dns_servers }} valid=30s;
{%- endif %}
listen 80;
server_name {{ hostname }};

Expand All @@ -45,8 +46,10 @@ server {
proxy_set_header X-Real-IP $remote_addr;
{%- if swarm_mode %}
proxy_pass http://{{ services[service_name]['addresses'][0] }}:{{ services[service_name]['port'] }}{{ services[service_name]['remote_path'] }};
proxy_redirect http://{{ services[service_name]['addresses'][0] }}:{{ services[service_name]['port'] }}{{ services[service_name]['remote_path'] }} $scheme://{{ hostname }}{{ services[service_name]['remote_path'] }};
{%- else %}
proxy_pass http://{{service_name|lower}}{{services[service_name]['remote_path']}};
proxy_redirect http://{{service_name|lower}}{{services[service_name]['remote_path']}} $scheme://{{ hostname }}{{ services[service_name]['remote_path'] }};
{%- endif %}
proxy_http_version 1.1;
proxy_set_header Connection "";
Expand All @@ -55,6 +58,9 @@ server {
}
{%- else %}
server {
{%- if swarm_mode %}
resolver {{ dns_servers }} valid=30s;
{%- endif %}
listen 80;
server_name {{ hostname }};

Expand All @@ -76,6 +82,9 @@ server {
{%- endif %}
{%- if host['protocols']['https'] %}
server {
{%- if swarm_mode %}
resolver {{ dns_servers }} valid=30s;
{%- endif %}
listen 443;
server_name {{ hostname }};

Expand Down Expand Up @@ -111,8 +120,10 @@ server {
proxy_set_header X-Real-IP $remote_addr;
{%- if swarm_mode %}
proxy_pass http://{{ services[service_name]['addresses'][0] }}:{{ services[service_name]['port'] }}{{ services[service_name]['remote_path'] }};
proxy_redirect http://{{ services[service_name]['addresses'][0] }}:{{ services[service_name]['port'] }}{{ services[service_name]['remote_path'] }} $scheme://{{ hostname }}{{ services[service_name]['remote_path'] }};
{%- else %}
proxy_pass http://{{service_name|lower}}{{services[service_name]['remote_path']}};
proxy_redirect http://{{service_name|lower}}{{services[service_name]['remote_path']}} $scheme://{{ hostname }}{{ services[service_name]['remote_path'] }};
{%- endif %}
proxy_http_version 1.1;
proxy_set_header Connection "";
Expand Down