From f2237a8e00e80d4f49a564d702f40bc1e3c9ff81 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 20 Feb 2020 05:28:39 -0600
Subject: [PATCH] Migrate nextcloud

---
 roles/nextcloud/tasks/main.yml | 43 ++++++++++++----------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 60fa239..66a3cdf 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -75,32 +75,19 @@
           name: "nextcloud-cron"
           minute: "*/5"
           job: 'php -f "{{ nextcloud_webroot }}/cron.php"'
-  - name: Register certificates
-    block:
-      # Note: We copy over some insecure configs now
-      # Reason being there's no way for the https role to handle every site's
-      # configuration on its own. If it doesn't have to update the key, it
-      # won't reload Apache and our site will never actually see https downtime
-      - name: Configure insecure virtual host configs
-        template:
-          src: apache2-vhost.conf
-          dest: "/etc/apache2/sites-enabled/{{ nextcloud_url }}.conf"
-      - name: Generate certificate
-        include_role:
-          name: https
-        vars:
-          website_url: "{{ nextcloud_url }}"
-          website_webroot: "{{ nextcloud_webroot }}"
-  - name: Secure Apache
-    block:
-      # If we copied over http-only configs before, they get oblooterated now
-      - name: Copy over virtual host configs
-        template:
-          src: apache2-vhost-ssl.conf
-          dest: "/etc/apache2/sites-enabled/{{ nextcloud_url }}.conf"
-      - name: Reload Apache
-        service:
-          name: apache2
-          state: reloaded
-          enabled: true
+  - name: Copy over virtual host configs
+    template:
+      src: apache2-vhost-ssl.conf
+      dest: "/etc/apache2/sites-enabled/{{ nextcloud_url }}.conf"
+  - name: Generate certificate
+    include_role:
+      name: https
+    vars:
+      website_url: "{{ nextcloud_url }}"
+      website_webroot: "{{ nextcloud_webroot }}"
+  - name: Reload Apache
+    service:
+      name: apache2
+      state: reloaded
+      enabled: true
   become: yes