diff options
author | Christian Pointner <equinox@spreadspace.org> | 2019-10-12 05:36:28 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2019-10-12 05:36:28 +0200 |
commit | 8477c34bb3470341fb8ebb7b18d3d694d2941f3b (patch) | |
tree | a73cb6a053dab23b4cf1a6ef8dc92d5e214cd862 | |
parent | sk-cloudia nginx role (diff) |
refactoring nginx config snippets
-rw-r--r-- | roles/nginx/defaults/main.yml | 8 | ||||
-rw-r--r-- | roles/nginx/files/conf.d/connection-upgrade.conf | 6 | ||||
-rw-r--r-- | roles/nginx/files/snippets/hsts.conf (renamed from files/common/nginx-snippets/hsts.conf) | 0 | ||||
-rw-r--r-- | roles/nginx/files/snippets/proxy-nobuff.conf (renamed from files/common/nginx-snippets/proxy-nobuff.conf) | 0 | ||||
-rw-r--r-- | roles/nginx/files/snippets/security-headers.conf (renamed from files/common/nginx-snippets/security-headers.conf) | 0 | ||||
-rw-r--r-- | roles/nginx/files/snippets/ssl.conf (renamed from files/common/nginx-snippets/ssl.conf) | 0 | ||||
-rw-r--r-- | roles/nginx/tasks/main.yml | 13 | ||||
-rw-r--r-- | roles/nginx/templates/generic-proxy-no-buffering-with-acme.conf.j2 | 12 |
8 files changed, 24 insertions, 15 deletions
diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index 73b10a11..a38a95a0 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -1,6 +1,14 @@ --- nginx_pkg_variant: nginx-light +nginx_conf_d_files: + - connection-upgrade + +nginx_snippets: + - ssl + - hsts + - proxy-nobuff + # nginx_vhosts: # example: # template: generic-proxy-no-buffering-with-acme diff --git a/roles/nginx/files/conf.d/connection-upgrade.conf b/roles/nginx/files/conf.d/connection-upgrade.conf new file mode 100644 index 00000000..4153effe --- /dev/null +++ b/roles/nginx/files/conf.d/connection-upgrade.conf @@ -0,0 +1,6 @@ +# used for websockets +# set http_connection to either upgrade or close (as normal) +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; +} diff --git a/files/common/nginx-snippets/hsts.conf b/roles/nginx/files/snippets/hsts.conf index 4ca8396e..4ca8396e 100644 --- a/files/common/nginx-snippets/hsts.conf +++ b/roles/nginx/files/snippets/hsts.conf diff --git a/files/common/nginx-snippets/proxy-nobuff.conf b/roles/nginx/files/snippets/proxy-nobuff.conf index b08de70c..b08de70c 100644 --- a/files/common/nginx-snippets/proxy-nobuff.conf +++ b/roles/nginx/files/snippets/proxy-nobuff.conf diff --git a/files/common/nginx-snippets/security-headers.conf b/roles/nginx/files/snippets/security-headers.conf index b94d479d..b94d479d 100644 --- a/files/common/nginx-snippets/security-headers.conf +++ b/roles/nginx/files/snippets/security-headers.conf diff --git a/files/common/nginx-snippets/ssl.conf b/roles/nginx/files/snippets/ssl.conf index d187a7c0..d187a7c0 100644 --- a/files/common/nginx-snippets/ssl.conf +++ b/roles/nginx/files/snippets/ssl.conf diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index fd63954e..57816cea 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -10,12 +10,17 @@ state: absent notify: restart nginx +- name: install nginx config.d files + loop: "{{ nginx_conf_d_files }}" + copy: + src: "conf.d/{{ item }}.conf" + dest: /etc/nginx/conf.d/ + notify: restart nginx + - name: install nginx config snippets - loop: - - ssl - - hsts + loop: "{{ nginx_snippets }}" copy: - src: "{{ global_files_dir }}/common/nginx-snippets/{{ item }}.conf" + src: "snippets/{{ item }}.conf" dest: /etc/nginx/snippets/ notify: restart nginx diff --git a/roles/nginx/templates/generic-proxy-no-buffering-with-acme.conf.j2 b/roles/nginx/templates/generic-proxy-no-buffering-with-acme.conf.j2 index 784b2590..8cad2994 100644 --- a/roles/nginx/templates/generic-proxy-no-buffering-with-acme.conf.j2 +++ b/roles/nginx/templates/generic-proxy-no-buffering-with-acme.conf.j2 @@ -1,10 +1,3 @@ -# used for websockets -# set http_connection to either upgrade or close (as normal) -map $http_upgrade $connection_upgrade { - default upgrade; - '' close; -} - server { listen 80; listen [::]:80; @@ -29,10 +22,7 @@ server { include snippets/hsts.conf; location / { - proxy_buffering off; - proxy_ignore_headers "X-Accel-Buffering"; - proxy_request_buffering off; - proxy_http_version 1.1; + include snippets/proxy-nobuff.conf; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; |