Migrate redirect to new https behavior

roles/redirect/tasks/main.yml

@@ -3,42 +3,17 @@
 ---
 - name: Set up redirect
   block:
-    - name: Set up Apache
+    - name: Copy over redirect config
-      block:
+      template:
-        # Why does a redirect need a webroot?
+        src: apache2-redirect.conf
-        # Answer: SSL certification
+        dest: "/etc/apache2/sites-enabled/{{ redirect_from }}.conf"
-        - name: Create webroot
+    - name: Generate certificate
-          file:
+      include_role:
-            path: "{{ redirect_webroot }}"
+        name: https
-            mode: "0755"
+      vars:
-            recurse: yes
+        website_url: "{{ redirect_from }}"
-            state: directory
+    - name: Reload Apache
-    - name: Register certificates
+      service:
-      block:
+        name: apache2
-        - name: Configure temporary virtual host configs
+        state: reloaded
-          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
   become: yes