Update to 2020-09-30 17:00

master
Daniel Berteaud 4 years ago
parent 84be9e14a1
commit e6bb6f268c
  1. 2
      roles/letsencrypt/defaults/main.yml
  2. 2
      roles/letsencrypt/tasks/main.yml
  3. 1
      roles/nginx/tasks/conf.yml
  4. 4
      roles/nginx/templates/ansible_conf.d/30-vhosts.conf.j2
  5. 1
      roles/nginx/templates/ansible_conf.d/custom.inc.j2

@ -1,7 +1,7 @@
--- ---
# Set the API endpoint to use. Default is to use https://acme-v02.api.letsencrypt.org/directory # Set the API endpoint to use. Default is to use https://acme-v02.api.letsencrypt.org/directory
# letsencrypt_ca: https://acme-staging.api.letsencrypt.org/directory # letsencrypt_ca: https://acme-staging-v02.api.letsencrypt.org/directory
# letsencrypt_key_size: 4096 # letsencrypt_key_size: 4096
# letsencrypt_renew_days: 30 # letsencrypt_renew_days: 30

@ -125,7 +125,7 @@
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- name: Reload httpd config - name: Reload httpd config
service: name=httpd state=reloaded command: /bin/systemctl condreload httpd
when: when:
- letsencrypt_httpd_conf.changed - letsencrypt_httpd_conf.changed
- letsencrypt_httpd.stat.exists - letsencrypt_httpd.stat.exists

@ -11,6 +11,7 @@
- ansible_conf.d/perf.inc - ansible_conf.d/perf.inc
- ansible_conf.d/force_ssl.inc - ansible_conf.d/force_ssl.inc
- ansible_conf.d/acme.inc - ansible_conf.d/acme.inc
- ansible_conf.d/custom.inc
- ansible_conf.d/llng_headers.inc - ansible_conf.d/llng_headers.inc
- ansible_conf.d/cache.inc - ansible_conf.d/cache.inc
- ansible_conf.d/10-cache.conf - ansible_conf.d/10-cache.conf

@ -66,6 +66,10 @@ server {
include /etc/nginx/ansible_conf.d/acme.inc; include /etc/nginx/ansible_conf.d/acme.inc;
{% endif %} {% endif %}
# Include a custom fragment. Can be used to insert ACME challenges support during
# dehydrated hooks for example
include /etc/nginx/ansible_conf.d/custom.inc;
{% if vhost.ssl.forced and vhost.ssl.enabled %} {% if vhost.ssl.forced and vhost.ssl.enabled %}
include /etc/nginx/ansible_conf.d/force_ssl.inc; include /etc/nginx/ansible_conf.d/force_ssl.inc;
{% endif %} {% endif %}

Loading…
Cancel
Save