Merge pull request #10 from coopdevs/feature/separate-cert-creation-t…

…o-task Move certificate creation to its own task
coopdevs · Jan 23, 2019 · 6c4797f · 6c4797f
2 parents 9e85774 + 2058be6
commit 6c4797f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/tasks/certificate.yml b/tasks/certificate.yml
@@ -0,0 +1,9 @@
+---
+- name: Check if certificate already exists
+  stat:
+    path: "/etc/letsencrypt/live/{{ certbot_nginx_cert_name | default(domain_name, true) }}/cert.pem"
+  register: letsencrypt_cert
+
+- name: Generate new certificate if one doesn't exist
+  shell: "certbot certonly --nginx --email '{{ letsencrypt_email }}' --agree-tos -d '{{ domain_name }}' {% if certbot_nginx_cert_name is defined %} --cert-name '{{ certbot_nginx_cert_name }}' {% endif %} {% if letsencrypt_staging %} --staging {% endif %}"
+  when: not letsencrypt_cert.stat.exists
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -14,11 +14,5 @@
     name: "python-certbot-nginx=0.28.0-1+ubuntu{{ ansible_distribution_version }}.1+certbot+3"
     state: present
 
-- name: Check if certificate already exists
-  stat:
-    path: "/etc/letsencrypt/live/{{ certbot_nginx_cert_name | default(domain_name, true) }}/cert.pem"
-  register: letsencrypt_cert
-
-- name: Generate new certificate if one doesn't exist
-  shell: "certbot certonly --nginx --email '{{ letsencrypt_email }}' --agree-tos -d '{{ domain_name }}' {% if certbot_nginx_cert_name %} --cert-name '{{ certbot_nginx_cert_name }}' {% endif %} {% if letsencrypt_staging %} --staging {% endif %}"
-  when: not letsencrypt_cert.stat.exists
+- import_tasks: certificate.yml
+  when: domain_name is defined