From b77975c1991c30f0e3f5f6f2e226f9801c7ad198 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 20 Feb 2020 05:27:03 -0600
Subject: [PATCH] Migrate redirect to new https behavior

---
 roles/redirect/tasks/main.yml | 51 +++++++++--------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/roles/redirect/tasks/main.yml b/roles/redirect/tasks/main.yml
index 6bcd434..715c3ea 100644
--- a/roles/redirect/tasks/main.yml
+++ b/roles/redirect/tasks/main.yml
@@ -3,42 +3,17 @@
 ---
 - name: Set up redirect
   block:
-    - name: Set up Apache
-      block:
-        # Why does a redirect need a webroot?
-        # Answer: SSL certification
-        - name: Create webroot
-          file:
-            path: "{{ redirect_webroot }}"
-            mode: "0755"
-            recurse: yes
-            state: directory
-    - name: Register certificates
-      block:
-        - name: Configure temporary virtual host configs
-          template:
-            src: apache2-vhost.conf
-            dest: "/etc/apache2/sites-enabled/{{ redirect_from }}.conf"
-        - name: Generate certificate
-          include_role:
-            name: https
-          vars:
-            website_url: "{{ redirect_from }}"
-            website_webroot: "{{ redirect_webroot }}"
-    - name: Remove webroot
-      file:
-        path: "{{ redirect_webroot }}"
-        state: absent
-    - name: Configure Apache
-      block:
-        # If we copied over http-only configs before, they get oblooterated now
-        - name: Copy over redirect config
-          template:
-            src: apache2-redirect.conf
-            dest: "/etc/apache2/sites-enabled/{{ redirect_from }}.conf"
-        - name: Reload Apache
-          service:
-            name: apache2
-            state: reloaded
-            enabled: true
+    - name: Copy over redirect config
+      template:
+        src: apache2-redirect.conf
+        dest: "/etc/apache2/sites-enabled/{{ redirect_from }}.conf"
+    - name: Generate certificate
+      include_role:
+        name: https
+      vars:
+        website_url: "{{ redirect_from }}"
+    - name: Reload Apache
+      service:
+        name: apache2
+        state: reloaded
   become: yes