jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-08-04 07:37:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2024-09-23 23:00

Browse Source
This commit is contained in:
Daniel Berteaud
2024-09-23 23:00:09 +02:00
parent abb4d79e6c
commit 9c1159e3de
16 changed files with 127 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
roles/nginx/tasks/install.yml
View File

@@ -13,3 +13,12 @@
when: not nginx_openresty
tags: always
- block:
- name: Detect installed version
shell: |
nginx -v 2>&1| sed -E 's/nginx version: (nginx|openresty)\/([[:digit:]]+(\.[[:digit:]]+)*)/\2/'
register: nginx_installed_version
changed_when: false
- set_fact: nginx_installed_version={{ nginx_installed_version.stdout }}
tags: web,quickweb

4
roles/nginx/templates/ansible_conf.d/30-vhosts.conf.j2
View File

@@ -21,9 +21,11 @@ server {
listen {{ port }} ssl{% if vhost.name == '_' %} default_server{% endif %};
{% endfor %}
{% else %}
listen {{ vhost.ssl.port }} ssl{% if vhost.name == '_' %} default_server{% endif %};
listen {{ vhost.ssl.port }} ssl{% if nginx_installed_version is version('1.25.1', '<') %} http2{% endif %}{% if vhost.name == '_' %} default_server{% endif %};
{% endif %}
{% if nginx_installed_version is version('1.25.1', '>=') %}
http2 on;
{% endif %}
{% if vhost.ssl.cert is defined and vhost.ssl.key is defined %}
ssl_certificate {{ vhost.ssl.cert }};