From 021f2b5a9313957c92dadf5f58f9daa18e997f15 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 26 May 2016 12:43:37 +0200
Subject: [PATCH] Optimize LetsEncrypt and use their role also for HaProxy and
Drupal tasks
---
tasks/letsencrypt.yml | 13 -------------
tasks/main.yml | 4 ++--
templates/letsencrypt.ini | 1 +
3 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 tasks/letsencrypt.yml
create mode 120000 templates/letsencrypt.ini
diff --git a/tasks/letsencrypt.yml b/tasks/letsencrypt.yml
deleted file mode 100644
index d6d920b..0000000
--- a/tasks/letsencrypt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# file: roles/drupal/tasks/letsencrypt.yml
-
-- set_fact: filename='/etc/letsencrypt/live/{{ item.1.domain }}/cert.pem'
-
-- name: "Check LetsEncrypt Requirement"
- shell: ls {{ filename }}
- register: cert_available
- failed_when: false
-
-- name: "Install New Cert"
- shell: /opt/letsencrypt/letsencrypt-auto certonly -d {{ item.1.domain }} --apache --text --email {{ apache_server_admin }} --agree-tos --redirect --expand --non-interactive
- when: cert_available is defined and cert_available.stdout != filename
diff --git a/tasks/main.yml b/tasks/main.yml
index 9ec2302..a998cd7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,8 +5,8 @@
set_fact: role_drupal_started=true
- block:
- - name: "LetsEncrypt Certificates"
- include: letsencrypt.yml
+ - name: "Install Certs"
+ include: '../../letsencrypt/tasks/cert.yml'
with_subelements:
- '{{ drupal_settings }}'
- domains
diff --git a/templates/letsencrypt.ini b/templates/letsencrypt.ini
new file mode 120000
index 0000000..fc27efd
--- /dev/null
+++ b/templates/letsencrypt.ini
@@ -0,0 +1 @@
+../../letsencrypt/templates/letsencrypt.ini
\ No newline at end of file
--
GitLab