Unified http and https nginx proxy

This commit is contained in:
Kevin Veen-Birkenbach 2021-01-01 21:05:58 +01:00
parent 38616ff702
commit b9f87ad6cb
4 changed files with 6 additions and 19 deletions

View File

@ -4,7 +4,7 @@
command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}}
- name: configure {{domain}}.conf - name: configure {{domain}}.conf
template: src=domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
notify: restart nginx notify: restart nginx
- name: "create /etc/mailu/" - name: "create /etc/mailu/"

View File

@ -1,6 +0,0 @@
server
{
server_name {{domain}};
{% include 'roles/native-letsencrypt/templates/ssl_header.j2' %}
{% include 'roles/native-nginx-docker-proxy/templates/https_proxy_pass.conf.j2'%}
}

View File

@ -1,11 +0,0 @@
location /
{
proxy_pass https://127.0.0.1:{{https_port}}/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
proxy_connect_timeout 300;
proxy_send_timeout 300;
proxy_read_timeout 300;
send_timeout 300;
}

View File

@ -1,6 +1,10 @@
location / location /
{ {
proxy_pass http://127.0.0.1:{{http_port}}/; {% if https_port is defined %}
proxy_pass https://127.0.0.1:{{https_port}}/;
{% else %}
proxy_pass http://127.0.0.1:{{http_port}}/;
{% endif %}
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;