Migrate dokuwiki role

roles/dokuwiki/tasks/main.yml

@@ -39,15 +39,9 @@
               path: /var/www/dokuwiki.tgz
               state: absent
         when: not stat_webroot_index.stat.exists
-  - name: Register certificates
+      - name: Copy over virtual host configs
-    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
+          src: apache2-vhost-ssl.conf
           dest: "/etc/apache2/sites-enabled/{{ dokuwiki_url }}.conf"
   - name: Generate certificate
     include_role:
@@ -55,16 +49,8 @@
     vars:
       website_url: "{{ dokuwiki_url }}"
       website_webroot: "{{ dokuwiki_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/{{ dokuwiki_url }}.conf"
   - name: Reload Apache
     service:
       name: apache2
       state: reloaded
-          enabled: true
   become: yes