Webroot: allow to set default webroot path, overwritten by per-cert path

pull/97/head
Simon Spannagel 5 years ago
parent b37af73500
commit e1013946c5
  1. 6
      defaults/main.yml
  2. 2
      tasks/create-cert-webroot.yml

@ -14,6 +14,10 @@ certbot_hsts: false
certbot_create_if_missing: false certbot_create_if_missing: false
certbot_create_method: standalone certbot_create_method: standalone
certbot_admin_email: email@example.com certbot_admin_email: email@example.com
# Default webroot, overwritten by individual per-cert webroot directories
certbot_webroot: /var/www/letsencrypt
certbot_certs: [] certbot_certs: []
# - email: janedoe@example.com # - email: janedoe@example.com
# webroot: "/var/www/html/" # webroot: "/var/www/html/"
@ -30,7 +34,7 @@ certbot_create_command: >-
--noninteractive --agree-tos --noninteractive --agree-tos
--email {{ cert_item.email | default(certbot_admin_email) }} --email {{ cert_item.email | default(certbot_admin_email) }}
{{ '--webroot-path ' if certbot_create_method == 'webroot' else '' }} {{ '--webroot-path ' if certbot_create_method == 'webroot' else '' }}
{{ cert_item.webroot if certbot_create_method == 'webroot' else '' }} {{ cert_item.webroot | default(certbot_webroot) if certbot_create_method == 'webroot' else '' }}
-d {{ cert_item.domains | join(',') }} -d {{ cert_item.domains | join(',') }}
{{ '--pre-hook /etc/letsencrypt/renewal-hooks/pre/stop_services' {{ '--pre-hook /etc/letsencrypt/renewal-hooks/pre/stop_services'
if certbot_create_standalone_stop_services if certbot_create_standalone_stop_services

@ -14,7 +14,7 @@
- name: Create webroot directory if it doesn't exist yet - name: Create webroot directory if it doesn't exist yet
file: file:
path: "{{ cert_item.webroot }}" path: "{{ cert_item.webroot | default(certbot_webroot) }}"
state: directory state: directory
- name: Generate new certificate if one doesn't exist. - name: Generate new certificate if one doesn't exist.

Loading…
Cancel
Save