From d886a8c389a11c931b091747649e44c61c484f0d Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 16 Feb 2019 12:11:45 +0200
Subject: Refactor: install daily cron job, then invoke it, instead of inline

---
 roles/haproxy/tasks/main.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml
index b80f2c4..4a9b717 100644
--- a/roles/haproxy/tasks/main.yml
+++ b/roles/haproxy/tasks/main.yml
@@ -21,6 +21,19 @@
     name: certbot
     default_release: stretch-backports
 
+- name: "install daily cron job to create haproxy.pem"
+  copy:
+    content: |
+      #!/bin/sh
+      set -eu
+      cd /etc/letsencrypt/live/haproxy
+      cat fullchain.pem privkey.pem > /etc/ssl/haproxy.pem
+      systemctl restart haproxy
+    dest: /etc/cron.daily/haproxy.pem
+    owner: root
+    group: root
+    mode: 0755
+
 - name: "run certbot"
   shell: |
     set -eu
@@ -35,20 +48,7 @@
             --pre-hook "systemctl stop apache2 haproxy" \
             --post-hook "systemctl start apache2 haproxy" \
             -d "{{ haproxy_domain }}"
-    (cd /etc/letsencrypt/live/haproxy; cat fullchain.pem privkey.pem) \
-        > /etc/ssl/haproxy.pem
-
-- name: "install daily cron job to create haproxy.pem"
-  copy:
-    content: |
-      #!/bin/sh
-      cd /etc/letsencrypt/live/haproxy
-      cat fullchain.pem privkey.pem > /etc/ssl/haproxy.pem
-      systemctl restart haproxy
-    dest: /etc/cron.daily/haproxy.pem
-    owner: root
-    group: root
-    mode: 0755
+    /etc/cron.daily/haproxy.pem
 
 - name: install haproxy
   apt:
-- 
cgit v1.2.1