0.1.4-DEV-20191031-074215

-------------------------
    * ADD:
      - added client_max_body_size in proxy_site.j2 template so sites may permit uploads of larger files

    * MODIFY:
      - modified several sites to make use of client_max_body_size option
This commit is contained in:
Chris Hammer 2019-10-31 07:42:49 -04:00
parent bba2602f4f
commit bd82ec227c
4 changed files with 52 additions and 29 deletions

View File

@ -1,8 +1,8 @@
--- ---
proxy_site_conf_dir : /etc/nginx/conf.d proxy_site_conf_dir : /etc/nginx/conf.d
proxy_site_file : "{{ proxy_site_conf_dir }}/zen_proxy.conf" proxy_site_file : "{{ proxy_site_conf_dir }}/zen_proxy.conf"
proxy_site_version : 1.4 proxy_site_version : 1.5
proxy_site_revision : 20191029-101338 proxy_site_revision : 20191030-213756
proxy_site_log_path : /proxy_logs proxy_site_log_path : /proxy_logs
@ -19,3 +19,8 @@
# many websites are run from our apache host # many websites are run from our apache host
# ...lets define it here to make things easier # ...lets define it here to make things easier
proxy_default_host : zg-lxwb04.thezengarden.net proxy_default_host : zg-lxwb04.thezengarden.net
# some of our sites require uploads, and those uploads
# can be rather large; lets set a default max upload size:
proxy_default_max_upload: 512M

View File

@ -11,6 +11,7 @@ proxy_sites:
proto : https proto : https
dest : gitlab.thezengarden.net dest : gitlab.thezengarden.net
port : 443 port : 443
max_upload : "{{ proxy_default_max_upload }}"
hastebin.thezengarden.net: hastebin.thezengarden.net:
@ -55,10 +56,10 @@ proxy_sites:
port : 9090 port : 9090
hme-3.thezengarden.net: # hme-3.thezengarden.net:
proto : https # proto : https
dest : kaiju.thezengarden.net # dest : kaiju.thezengarden.net
port : 8006 # port : 8006
chat.thezengarden.net: chat.thezengarden.net:
@ -89,6 +90,7 @@ proxy_sites:
proto : http proto : http
dest : sa.thezengarden.net dest : sa.thezengarden.net
port : 8000 port : 8000
max_upload : "{{ proxy_default_max_upload }}"
awx.thezengarden.net: awx.thezengarden.net:
@ -107,12 +109,14 @@ proxy_sites:
proto : https proto : https
dest : "{{ proxy_default_host }}" dest : "{{ proxy_default_host }}"
port : 443 port : 443
max_upload : "{{ proxy_default_max_upload }}"
cloud.thezengarden.net: cloud.thezengarden.net:
proto : https proto : https
dest : zg-lxoc01.thezengarden.net dest : zg-lxoc01.thezengarden.net
port : 443 port : 443
max_upload : "{{ proxy_default_max_upload }}"
lakeshorebulldogs.com: lakeshorebulldogs.com:
@ -122,6 +126,7 @@ proxy_sites:
port : 80 port : 80
ssl_cert : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/fullchain1.pem" ssl_cert : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/fullchain1.pem"
ssl_key : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/privkey1.pem" ssl_key : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/privkey1.pem"
max_upload : "{{ proxy_default_max_upload }}"
resources.thezengarden.net: resources.thezengarden.net:
@ -135,6 +140,7 @@ proxy_sites:
proto : https proto : https
dest : "{{ proxy_default_host }}" dest : "{{ proxy_default_host }}"
port : 443 port : 443
max_upload : "{{ proxy_default_max_upload }}"
devel.thezengarden.net: devel.thezengarden.net:

View File

@ -1,10 +1,18 @@
--- ---
# tasks file for zen_rev_proxy # tasks file for zen_rev_proxy
- name: install nginx/aptitude - name: install nginx/aptitude for debian nodes
package: package:
name : ['nginx','aptitude'] name : ['nginx','aptitude']
state : present state : present
when : ansible_distribution == "Debian"
- name: install nginx for centos nodes
package:
name : nginx
state : present
when: ansible_distribution == "CentOS"
- name: enable nginx at boot time - name: enable nginx at boot time

View File

@ -23,6 +23,10 @@ server {
access_log {{ proxy_site_log_path }}/{{ item.key }}.log; access_log {{ proxy_site_log_path }}/{{ item.key }}.log;
{% if proxy_sites[item.key]['max_upload'] is defined %}
client_max_body_size {{ proxy_sites[item.key]['max_upload'] }};
{% endif %}
location / { location / {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;