diff --git a/defaults/main/proxy_site_defs.yml b/defaults/main/proxy_site_defs.yml index ec8d2cd..0b7f2c6 100644 --- a/defaults/main/proxy_site_defs.yml +++ b/defaults/main/proxy_site_defs.yml @@ -1,8 +1,8 @@ --- proxy_site_conf_dir : /etc/nginx/conf.d proxy_site_file : "{{ proxy_site_conf_dir }}/zen_proxy.conf" - proxy_site_version : 1.5 - proxy_site_revision : 20191030-213756 + proxy_site_version : 1.8 + proxy_site_revision : 20191031-132522 proxy_site_log_path : /proxy_logs diff --git a/defaults/main/proxy_sites.yml b/defaults/main/proxy_sites.yml index ccdbe71..d3f826a 100644 --- a/defaults/main/proxy_sites.yml +++ b/defaults/main/proxy_sites.yml @@ -87,10 +87,11 @@ proxy_sites: seafile.thezengarden.net: - proto : http - dest : sa.thezengarden.net - port : 8000 - max_upload : "{{ proxy_default_max_upload }}" + proto : http + dest : sa.thezengarden.net + port : 8000 + seafhttp_port : 8082 + max_upload : "{{ proxy_default_max_upload }}" awx.thezengarden.net: @@ -106,9 +107,9 @@ proxy_sites: images.thezengarden.net: - proto : https + proto : http dest : "{{ proxy_default_host }}" - port : 443 + port : 80 max_upload : "{{ proxy_default_max_upload }}" diff --git a/templates/proxy_site.j2 b/templates/proxy_site.j2 index 711e7f7..1cc48ba 100644 --- a/templates/proxy_site.j2 +++ b/templates/proxy_site.j2 @@ -31,7 +31,8 @@ client_max_body_size {{ proxy_sites[item.key]['max_upload'] }}; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + #proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Proto https; proxy_set_header Host $host; proxy_pass {{ proxy_sites[item.key]['proto'] }}://{{ proxy_sites[item.key]['dest'] }}:{{ proxy_sites[item.key]['port'] }}; @@ -40,4 +41,18 @@ client_max_body_size {{ proxy_sites[item.key]['max_upload'] }}; # re-write redirects to http as to https proxy_redirect http:// https://; } + +{% if item.key == "seafile.thezengarden.net" %} + location /seafhttp { + rewrite ^/seafhttp(.*)$ $1 break; + proxy_pass {{ proxy_sites[item.key]['proto'] }}://{{ proxy_sites[item.key]['dest'] }}:{{ proxy_sites[item.key]['seafhttp_port'] }}; + client_max_body_size 0; + + proxy_connect_timeout 36000s; + proxy_read_timeout 36000s; + proxy_send_timeout 36000s; + send_timeout 36000s; + proxy_request_buffering off; + } +{% endif %} }