diff --git a/ansible/galaxy-requirements.yml b/ansible/galaxy-requirements.yml index b70edda..dcffea9 100644 --- a/ansible/galaxy-requirements.yml +++ b/ansible/galaxy-requirements.yml @@ -18,7 +18,5 @@ roles: version: 1.0.0 - src: dokku_bot.ansible_dokku version: v2022.10.17 - - src: nginxinc.nginx - version: 0.24.1 - src: geerlingguy.certbot version: 5.1.0 diff --git a/ansible/roles/nginx/files/nginx.conf b/ansible/roles/nginx/files/nginx.conf index 08ad1ca..6931a13 100644 --- a/ansible/roles/nginx/files/nginx.conf +++ b/ansible/roles/nginx/files/nginx.conf @@ -5,6 +5,10 @@ error_log /var/log/nginx/error.log; load_module /usr/lib/nginx/modules/ngx_http_brotli_filter_module.so; load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so; +{% if ansible_os_family != 'Archlinux'%} +load_module /usr/lib/nginx/modules/ngx_stream_module.so; +{% endif %} + pcre_jit on; events { diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml index 178e0a6..c83a2c3 100644 --- a/ansible/roles/nginx/tasks/main.yml +++ b/ansible/roles/nginx/tasks/main.yml @@ -1,13 +1,6 @@ - name: Install nginx - import_role: - name: nginxinc.nginx - when: ansible_os_family != 'Archlinux' - become: true - -- name: Install nginx (mainline) on Arch package: - name: nginx-mainline - when: ansible_os_family == 'Archlinux' + name: "{{ 'nginx-mainline' if ansible_os_family == 'Archlinux' else 'nginx' }}" become: true - name: Install nginx modules @@ -16,6 +9,7 @@ loop: - libnginx-mod-http-headers-more-filter - libnginx-mod-http-brotli-filter + - libnginx-mod-stream when: ansible_os_family != 'Archlinux' become: true