Merge branch 'master' into systemd

tasks/create-cert-standalone.yml

@@ -0,0 +1,23 @@
+---
+- name: Check if certificate already exists.
+  stat:
+    path: /etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}/cert.pem
+  register: letsencrypt_cert
+
+- name: Stop services to allow certbot to generate a cert.
+  service:
+    name: "{{ item }}"
+    state: stopped
+  when: not letsencrypt_cert.stat.exists
+  with_items: "{{ certbot_create_standalone_stop_services }}"
+
+- name: Generate new certificate if one doesn't exist.
+  command: "{{ certbot_create_command }}"
+  when: not letsencrypt_cert.stat.exists
+
+- name: Start services after cert has been generated.
+  service:
+    name: "{{ item }}"
+    state: started
+  when: not letsencrypt_cert.stat.exists
+  with_items: "{{ certbot_create_standalone_stop_services }}"

tasks/install-from-source.yml

@@ -5,7 +5,7 @@
     dest: "{{ certbot_dir }}"
     version: "{{ certbot_version }}"
     update: "{{ certbot_keep_updated }}"
-    force: yes
+    force: true
 
 - name: Set Certbot script variable.
   set_fact:
@@ -14,4 +14,4 @@
 - name: Ensure certbot-auto is executable.
   file:
     path: "{{ certbot_script }}"
-    mode: 0755
+    mode: 0o755

tasks/main.yml

@@ -1,11 +1,26 @@
 ---
-- include: include-vars.yml
+- import_tasks: include-vars.yml
 
-- include: install-with-package.yml
+- import_tasks: install-with-package.yml
   when: not certbot_install_from_source
 
-- include: install-from-source.yml
+- import_tasks: install-from-source.yml
   when: certbot_install_from_source
 
+- include_tasks: create-cert-standalone.yml
+  with_items: "{{ certbot_certs }}"
+  when:
+    - certbot_create_if_missing
+    - certbot_create_method == 'standalone'
+  loop_control:
+    loop_var: cert_item
+
 - include: systemd.yml
-  when: certbot_auto_renew
+  when:
+    - certbot_auto_renew
+    - certbot_auto_renew_systemd
+
+- import_tasks: renew-cron.yml
+  when:
+    - certbot_auto_renew
+    - not certbot_auto_renew_systemd

tasks/renew-cron.yml

@@ -0,0 +1,8 @@
+---
+- name: Add cron job for certbot renewal (if configured).
+  cron:
+    name: Certbot automatic renewal.
+    job: "{{ certbot_script }} renew {{ certbot_auto_renew_options }}"
+    minute: "{{ certbot_auto_renew_minute }}"
+    hour: "{{ certbot_auto_renew_hour }}"
+    user: "{{ certbot_auto_renew_user }}"

tasks/systemd.yml

@@ -1,19 +1,13 @@
 ---
 
-- name: Resolve absolute path for certbot script
-  command: "which {{ certbot_script }}"
-  register: certbot_script_absolute
-  when: not certbot_install_from_source
-  changed_when: false
-
 - name: Create certbot-renew service
   template:
     src: certbot-renew.service.j2
     dest: /etc/systemd/system/certbot-renew.service
-  notify: restart-certbot-renew-service
+  notify: certbot restart renew timer
 
 - name: Create certbot-renew timer
   template:
     src: certbot-renew.timer.j2
     dest: /etc/systemd/system/certbot-renew.timer
-  notify: restart-certbot-renew-service
+  notify: certbot restart renew timer